sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Autogen - move RegEx compile

Browse Source 
compile each RegEx once not in loops/functions

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben 2018-04-04 06:34:02 +08:00 committed by Yonghong Zhu
parent ab0ff0b0a6
commit c8802c3dcc
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -50,6 +50,16 @@ from collections import OrderedDict
## Regular expression for splitting Dependency Expression string into tokens ## Regular expression for splitting Dependency Expression string into tokens
gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)") gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)")
## Regular expression for match: PCD(xxxx.yyy)
gPCDAsGuidPattern = re.compile(r"^PCD\(.+\..+\)$")
#
# Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC/RVCT
# is the former use /I , the Latter used -I to specify include directories
#
gBuildOptIncludePatternMsft = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL)
gBuildOptIncludePatternOther = re.compile(r"(?:.*?)-I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL)
# #
# Match name = variable # Match name = variable
# #
@ -819,13 +829,11 @@ class WorkspaceAutoGen(AutoGen):
InfFoundFlag = False InfFoundFlag = False
if FfsFile.NameGuid is not None: if FfsFile.NameGuid is not None:
_CheckPCDAsGuidPattern = re.compile("^PCD\(.+\..+\)$")
# #
# If the NameGuid reference a PCD name. # If the NameGuid reference a PCD name.
# The style must match: PCD(xxxx.yyy) # The style must match: PCD(xxxx.yyy)
# #
if _CheckPCDAsGuidPattern.match(FfsFile.NameGuid): if gPCDAsGuidPattern.match(FfsFile.NameGuid):
# #
# Replace the PCD value. # Replace the PCD value.
# #
@ -3316,9 +3324,9 @@ class ModuleAutoGen(AutoGen):
# is the former use /I , the Latter used -I to specify include directories # is the former use /I , the Latter used -I to specify include directories
# #
if self.PlatformInfo.ToolChainFamily in ('MSFT'): if self.PlatformInfo.ToolChainFamily in ('MSFT'):
gBuildOptIncludePattern = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL) BuildOptIncludeRegEx = gBuildOptIncludePatternMsft
elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT'): elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT'):
gBuildOptIncludePattern = re.compile(r"(?:.*?)-I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL) BuildOptIncludeRegEx = gBuildOptIncludePatternOther
else: else:
# #
# New ToolChainFamily, don't known whether there is option to specify include directories # New ToolChainFamily, don't known whether there is option to specify include directories
@ -3335,13 +3343,13 @@ class ModuleAutoGen(AutoGen):
FlagOption = '' FlagOption = ''
if self.PlatformInfo.ToolChainFamily != 'RVCT': if self.PlatformInfo.ToolChainFamily != 'RVCT':
IncPathList = [NormPath(Path, self.Macros) for Path in gBuildOptIncludePattern.findall(FlagOption)] IncPathList = [NormPath(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption)]
else: else:
# #
# RVCT may specify a list of directory seperated by commas # RVCT may specify a list of directory seperated by commas
# #
IncPathList = [] IncPathList = []
for Path in gBuildOptIncludePattern.findall(FlagOption): for Path in BuildOptIncludeRegEx.findall(FlagOption):
PathList = GetSplitList(Path, TAB_COMMA_SPLIT) PathList = GetSplitList(Path, TAB_COMMA_SPLIT)
IncPathList += [NormPath(PathEntry, self.Macros) for PathEntry in PathList] IncPathList += [NormPath(PathEntry, self.Macros) for PathEntry in PathList]