# build a platform or a module\r
#\r
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
import traceback\r
import encodings.ascii\r
import itertools\r
+import multiprocessing\r
\r
from struct import *\r
from threading import *\r
\r
import Common.EdkLogger\r
import Common.GlobalData as GlobalData\r
+from GenFds.GenFds import GenFds\r
\r
# Version and Copyright\r
VersionNumber = "0.60" + ' ' + gBUILD_VERSION\r
# @param WorkingDir The directory in which the program will be running\r
#\r
def LaunchCommand(Command, WorkingDir):\r
+ BeginTime = time.time()\r
# if working directory doesn't exist, Popen() will raise an exception\r
if not os.path.isdir(WorkingDir):\r
EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=WorkingDir)\r
EdkLogger.info(RespContent)\r
\r
EdkLogger.error("build", COMMAND_FAILURE, ExtraData="%s [%s]" % (Command, WorkingDir))\r
+ return "%dms" % (int(round((time.time() - BeginTime) * 1000)))\r
\r
## The smallest unit that can be built in multi-thread build mode\r
#\r
#\r
def _CommandThread(self, Command, WorkingDir):\r
try:\r
- LaunchCommand(Command, WorkingDir)\r
+ self.BuildItem.BuildObject.BuildTime = LaunchCommand(Command, WorkingDir)\r
self.CompleteFlag = True\r
except:\r
#\r
self.SkipAutoGen = BuildOptions.SkipAutoGen\r
self.Reparse = BuildOptions.Reparse\r
self.SkuId = BuildOptions.SkuId\r
+ if self.SkuId:\r
+ GlobalData.gSKUID_CMD = self.SkuId\r
self.ConfDirectory = BuildOptions.ConfDirectory\r
self.SpawnMode = True\r
self.BuildReport = BuildReport(BuildOptions.ReportFile, BuildOptions.ReportType)\r
self.TargetTxt = TargetTxtClassObject()\r
self.ToolDef = ToolDefClassObject()\r
+ self.AutoGenTime = 0\r
+ self.MakeTime = 0\r
+ self.GenFdsTime = 0\r
GlobalData.BuildOptionPcd = BuildOptions.OptionPcd\r
#Set global flag for build mode\r
GlobalData.gIgnoreSource = BuildOptions.IgnoreSources\r
+ GlobalData.gUseHashCache = BuildOptions.UseHashCache\r
+ GlobalData.gBinCacheDest = BuildOptions.BinCacheDest\r
+ GlobalData.gBinCacheSource = BuildOptions.BinCacheSource\r
+ GlobalData.gEnableGenfdsMultiThread = BuildOptions.GenfdsMultiThread\r
+\r
+ if GlobalData.gBinCacheDest and not GlobalData.gUseHashCache:\r
+ EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-destination must be used together with --hash.")\r
+\r
+ if GlobalData.gBinCacheSource and not GlobalData.gUseHashCache:\r
+ EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-source must be used together with --hash.")\r
+\r
+ if GlobalData.gBinCacheDest and GlobalData.gBinCacheSource:\r
+ EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-destination can not be used together with --binary-source.")\r
+\r
+ if GlobalData.gBinCacheSource:\r
+ BinCacheSource = os.path.normpath(GlobalData.gBinCacheSource)\r
+ if not os.path.isabs(BinCacheSource):\r
+ BinCacheSource = mws.join(self.WorkspaceDir, BinCacheSource)\r
+ GlobalData.gBinCacheSource = BinCacheSource\r
+ else:\r
+ if GlobalData.gBinCacheSource != None:\r
+ EdkLogger.error("build", OPTION_VALUE_INVALID, ExtraData="Invalid value of option --binary-source.")\r
+\r
+ if GlobalData.gBinCacheDest:\r
+ BinCacheDest = os.path.normpath(GlobalData.gBinCacheDest)\r
+ if not os.path.isabs(BinCacheDest):\r
+ BinCacheDest = mws.join(self.WorkspaceDir, BinCacheDest)\r
+ GlobalData.gBinCacheDest = BinCacheDest\r
+ else:\r
+ if GlobalData.gBinCacheDest != None:\r
+ EdkLogger.error("build", OPTION_VALUE_INVALID, ExtraData="Invalid value of option --binary-destination.")\r
\r
if self.ConfDirectory:\r
# Get alternate Conf location, if it is absolute, then just use the absolute directory name\r
self.LoadFixAddress = 0\r
self.UniFlag = BuildOptions.Flag\r
self.BuildModules = []\r
+ self.HashSkipModules = []\r
self.Db_Flag = False\r
self.LaunchPrebuildFlag = False\r
- self.PrebuildScript = ''\r
- self.PostbuildScript = ''\r
self.PlatformBuildPath = os.path.join(GlobalData.gConfDirectory,'.cache', '.PlatformBuild')\r
if BuildOptions.CommandLength:\r
GlobalData.gCommandMaxLength = BuildOptions.CommandLength\r
EdkLogger.quiet("%-16s = %s" % ("CONF_PATH", GlobalData.gConfDirectory))\r
self.InitPreBuild()\r
self.InitPostBuild()\r
- if self.PrebuildScript:\r
- EdkLogger.quiet("%-16s = %s" % ("PREBUILD", self.PrebuildScript))\r
- if self.PostbuildScript:\r
- EdkLogger.quiet("%-16s = %s" % ("POSTBUILD", self.PostbuildScript))\r
- if self.PrebuildScript:\r
+ if self.Prebuild:\r
+ EdkLogger.quiet("%-16s = %s" % ("PREBUILD", self.Prebuild))\r
+ if self.Postbuild:\r
+ EdkLogger.quiet("%-16s = %s" % ("POSTBUILD", self.Postbuild))\r
+ if self.Prebuild:\r
self.LaunchPrebuild()\r
self.TargetTxt = TargetTxtClassObject()\r
self.ToolDef = ToolDefClassObject()\r
for Tool in self.ToolChainList:\r
if TAB_TOD_DEFINES_FAMILY not in ToolDefinition or Tool not in ToolDefinition[TAB_TOD_DEFINES_FAMILY] \\r
or not ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool]:\r
- EdkLogger.warn("No tool chain family found in configuration for %s. Default to MSFT." % Tool)\r
+ EdkLogger.warn("build", "No tool chain family found in configuration for %s. Default to MSFT." % Tool)\r
ToolChainFamily.append("MSFT")\r
else:\r
ToolChainFamily.append(ToolDefinition[TAB_TOD_DEFINES_FAMILY][Tool])\r
self.ThreadNumber = int(self.ThreadNumber, 0)\r
\r
if self.ThreadNumber == 0:\r
- self.ThreadNumber = 1\r
+ try:\r
+ self.ThreadNumber = multiprocessing.cpu_count()\r
+ except (ImportError, NotImplementedError):\r
+ self.ThreadNumber = 1\r
\r
if not self.PlatformFile:\r
PlatformFile = self.TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_ACTIVE_PLATFORM]\r
Platform = self.Db._MapPlatform(str(self.PlatformFile))\r
self.Prebuild = str(Platform.Prebuild)\r
if self.Prebuild:\r
- PrebuildList = self.Prebuild.split()\r
- if not os.path.isabs(PrebuildList[0]):\r
- PrebuildList[0] = mws.join(self.WorkspaceDir, PrebuildList[0])\r
- if os.path.isfile(PrebuildList[0]):\r
- self.PrebuildScript = PrebuildList[0]\r
- self.Prebuild = ' '.join(PrebuildList)\r
- self.Prebuild += self.PassCommandOption(self.BuildTargetList, self.ArchList, self.ToolChainList)\r
- #self.LaunchPrebuild()\r
- else:\r
- EdkLogger.error("Prebuild", PREBUILD_ERROR, "the prebuild script %s is not exist.\n If you'd like to disable the Prebuild process, please use the format: -D PREBUILD=\"\" " %(PrebuildList[0]))\r
+ PrebuildList = []\r
+ #\r
+ # Evaluate all arguments and convert arguments that are WORKSPACE\r
+ # relative paths to absolute paths. Filter arguments that look like\r
+ # flags or do not follow the file/dir naming rules to avoid false\r
+ # positives on this conversion.\r
+ #\r
+ for Arg in self.Prebuild.split():\r
+ #\r
+ # Do not modify Arg if it looks like a flag or an absolute file path\r
+ #\r
+ if Arg.startswith('-') or os.path.isabs(Arg):\r
+ PrebuildList.append(Arg)\r
+ continue\r
+ #\r
+ # Do not modify Arg if it does not look like a Workspace relative\r
+ # path that starts with a valid package directory name\r
+ #\r
+ if not Arg[0].isalpha() or os.path.dirname(Arg) == '':\r
+ PrebuildList.append(Arg)\r
+ continue\r
+ #\r
+ # If Arg looks like a WORKSPACE relative path, then convert to an\r
+ # absolute path and check to see if the file exists.\r
+ #\r
+ Temp = mws.join(self.WorkspaceDir, Arg)\r
+ if os.path.isfile(Temp):\r
+ Arg = Temp\r
+ PrebuildList.append(Arg)\r
+ self.Prebuild = ' '.join(PrebuildList)\r
+ self.Prebuild += self.PassCommandOption(self.BuildTargetList, self.ArchList, self.ToolChainList, self.PlatformFile, self.Target)\r
\r
def InitPostBuild(self):\r
if 'POSTBUILD' in GlobalData.gCommandLineDefines.keys():\r
Platform = self.Db._MapPlatform(str(self.PlatformFile))\r
self.Postbuild = str(Platform.Postbuild)\r
if self.Postbuild:\r
- PostbuildList = self.Postbuild.split()\r
- if not os.path.isabs(PostbuildList[0]):\r
- PostbuildList[0] = mws.join(self.WorkspaceDir, PostbuildList[0])\r
- if os.path.isfile(PostbuildList[0]):\r
- self.PostbuildScript = PostbuildList[0]\r
- self.Postbuild = ' '.join(PostbuildList)\r
- self.Postbuild += self.PassCommandOption(self.BuildTargetList, self.ArchList, self.ToolChainList)\r
- else:\r
- EdkLogger.error("Postbuild", POSTBUILD_ERROR, "the postbuild script %s is not exist.\n If you'd like to disable the Postbuild process, please use the format: -D POSTBUILD=\"\" " %(PostbuildList[0]))\r
-\r
- def PassCommandOption(self, BuildTarget, TargetArch, ToolChain):\r
+ PostbuildList = []\r
+ #\r
+ # Evaluate all arguments and convert arguments that are WORKSPACE\r
+ # relative paths to absolute paths. Filter arguments that look like\r
+ # flags or do not follow the file/dir naming rules to avoid false\r
+ # positives on this conversion.\r
+ #\r
+ for Arg in self.Postbuild.split():\r
+ #\r
+ # Do not modify Arg if it looks like a flag or an absolute file path\r
+ #\r
+ if Arg.startswith('-') or os.path.isabs(Arg):\r
+ PostbuildList.append(Arg)\r
+ continue\r
+ #\r
+ # Do not modify Arg if it does not look like a Workspace relative\r
+ # path that starts with a valid package directory name\r
+ #\r
+ if not Arg[0].isalpha() or os.path.dirname(Arg) == '':\r
+ PostbuildList.append(Arg)\r
+ continue\r
+ #\r
+ # If Arg looks like a WORKSPACE relative path, then convert to an\r
+ # absolute path and check to see if the file exists.\r
+ #\r
+ Temp = mws.join(self.WorkspaceDir, Arg)\r
+ if os.path.isfile(Temp):\r
+ Arg = Temp\r
+ PostbuildList.append(Arg)\r
+ self.Postbuild = ' '.join(PostbuildList)\r
+ self.Postbuild += self.PassCommandOption(self.BuildTargetList, self.ArchList, self.ToolChainList, self.PlatformFile, self.Target)\r
+\r
+ def PassCommandOption(self, BuildTarget, TargetArch, ToolChain, PlatformFile, Target):\r
BuildStr = ''\r
if GlobalData.gCommand and isinstance(GlobalData.gCommand, list):\r
BuildStr += ' ' + ' '.join(GlobalData.gCommand)\r
TargetFlag = False\r
ArchFlag = False\r
ToolChainFlag = False\r
+ PlatformFileFlag = False\r
\r
if GlobalData.gOptions and not GlobalData.gOptions.BuildTarget:\r
TargetFlag = True\r
ArchFlag = True\r
if GlobalData.gOptions and not GlobalData.gOptions.ToolChain:\r
ToolChainFlag = True\r
+ if GlobalData.gOptions and not GlobalData.gOptions.PlatformFile:\r
+ PlatformFileFlag = True\r
\r
if TargetFlag and BuildTarget:\r
if isinstance(BuildTarget, list) or isinstance(BuildTarget, tuple):\r
BuildStr += ' -t ' + ' -t '.join(ToolChain)\r
elif isinstance(ToolChain, str):\r
BuildStr += ' -t ' + ToolChain\r
+ if PlatformFileFlag and PlatformFile:\r
+ if isinstance(PlatformFile, list) or isinstance(PlatformFile, tuple):\r
+ BuildStr += ' -p ' + ' -p '.join(PlatformFile)\r
+ elif isinstance(PlatformFile, str):\r
+ BuildStr += ' -p' + PlatformFile\r
+ BuildStr += ' --conf=' + GlobalData.gConfDirectory\r
+ if Target:\r
+ BuildStr += ' ' + Target\r
\r
return BuildStr\r
\r
if self.Prebuild:\r
EdkLogger.info("\n- Prebuild Start -\n")\r
self.LaunchPrebuildFlag = True\r
+ #\r
+ # The purpose of .PrebuildEnv file is capture environment variable settings set by the prebuild script\r
+ # and preserve them for the rest of the main build step, because the child process environment will\r
+ # evaporate as soon as it exits, we cannot get it in build step.\r
+ #\r
PrebuildEnvFile = os.path.join(GlobalData.gConfDirectory,'.cache','.PrebuildEnv')\r
if os.path.isfile(PrebuildEnvFile):\r
os.remove(PrebuildEnvFile)\r
os.remove(self.PlatformBuildPath)\r
if sys.platform == "win32":\r
args = ' && '.join((self.Prebuild, 'set > ' + PrebuildEnvFile))\r
- Process = Popen(args, stdout=PIPE, stderr=PIPE)\r
+ Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)\r
else:\r
args = ' && '.join((self.Prebuild, 'env > ' + PrebuildEnvFile))\r
Process = Popen(args, stdout=PIPE, stderr=PIPE, shell=True)\r
if self.Postbuild:\r
EdkLogger.info("\n- Postbuild Start -\n")\r
if sys.platform == "win32":\r
- Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE)\r
+ Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True)\r
else:\r
Process = Popen(self.Postbuild, stdout=PIPE, stderr=PIPE, shell=True)\r
# launch two threads to read the STDOUT and STDERR\r
# @param CreateDepModuleMakeFile Flag used to indicate creating makefile\r
# for dependent modules/Libraries\r
#\r
- def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
+ def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False, FfsCommand={}):\r
if AutoGenObject == None:\r
return False\r
\r
\r
if not self.SkipAutoGen or Target == 'genmake':\r
self.Progress.Start("Generating makefile")\r
- AutoGenObject.CreateMakeFile(CreateDepsMakeFile)\r
+ AutoGenObject.CreateMakeFile(CreateDepsMakeFile, FfsCommand)\r
self.Progress.Stop("done!")\r
if Target == "genmake":\r
return True\r
if BuildModule:\r
if Target != 'fds':\r
BuildCommand = BuildCommand + [Target]\r
- LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
+ AutoGenObject.BuildTime = LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
self.CreateAsBuiltInf()\r
return True\r
\r
if IsIpfPlatform and ImageInfo.Image.Size % 0x2000 != 0:\r
ImageInfo.Image.Size = (ImageInfo.Image.Size / 0x2000 + 1) * 0x2000\r
RtSize += ImageInfo.Image.Size\r
- elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER']:\r
+ elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER', 'MM_STANDALONE', 'MM_CORE_STANDALONE']:\r
SmmModuleList[Module.MetaFile] = ImageInfo\r
SmmSize += ImageInfo.Image.Size\r
if Module.ModuleType == 'DXE_SMM_DRIVER':\r
self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
self.BuildReport.AddPlatformReport(Wa)\r
self.Progress.Stop("done!")\r
+\r
+ # Add ffs build to makefile\r
+ CmdListDict = {}\r
+ if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+ CmdListDict = self._GenFfsCmd()\r
+\r
for Arch in Wa.ArchList:\r
GlobalData.gGlobalDefines['ARCH'] = Arch\r
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
if Ma == None:\r
continue\r
self.BuildModules.append(Ma)\r
- self._BuildPa(self.Target, Pa)\r
+ self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict)\r
\r
# Create MAP file when Load Fix Address is enabled.\r
if self.Target in ["", "all", "fds"]:\r
GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
index = 0\r
for ToolChain in self.ToolChainList:\r
+ WorkspaceAutoGenTime = time.time()\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
self.Fdf = Wa.FdfFile\r
self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
Wa.CreateMakeFile(False)\r
+ # Add ffs build to makefile\r
+ CmdListDict = None\r
+ if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+ CmdListDict = self._GenFfsCmd()\r
self.Progress.Stop("done!")\r
MaList = []\r
+ ExitFlag = threading.Event()\r
+ ExitFlag.clear()\r
+ self.AutoGenTime += int(round((time.time() - WorkspaceAutoGenTime)))\r
for Arch in Wa.ArchList:\r
+ AutoGenStart = time.time()\r
GlobalData.gGlobalDefines['ARCH'] = Arch\r
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
for Module in Pa.Platform.Modules:\r
- if self.ModuleFile.Dir == Module.Dir and self.ModuleFile.File == Module.File:\r
+ if self.ModuleFile.Dir == Module.Dir and self.ModuleFile.Name == Module.Name:\r
Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile)\r
if Ma == None: continue\r
MaList.append(Ma)\r
+ if Ma.CanSkipbyHash():\r
+ self.HashSkipModules.append(Ma)\r
+ continue\r
+ # Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds'\r
+ if self.Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:\r
+ # for target which must generate AutoGen code and makefile\r
+ if not self.SkipAutoGen or self.Target == 'genc':\r
+ Ma.CreateCodeFile(True)\r
+ if not self.SkipAutoGen or self.Target == 'genmake':\r
+ if CmdListDict and self.Fdf and (Module.File, Arch) in CmdListDict:\r
+ Ma.CreateMakeFile(True, CmdListDict[Module.File, Arch])\r
+ del CmdListDict[Module.File, Arch]\r
+ else:\r
+ Ma.CreateMakeFile(True)\r
self.BuildModules.append(Ma)\r
- if not Ma.IsBinaryModule:\r
- self._Build(self.Target, Ma, BuildModule=True)\r
+ self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
+ MakeStart = time.time()\r
+ for Ma in self.BuildModules:\r
+ if not Ma.IsBinaryModule:\r
+ Bt = BuildTask.New(ModuleMakeUnit(Ma, self.Target))\r
+ # Break build if any build thread has error\r
+ if BuildTask.HasError():\r
+ # we need a full version of makefile for platform\r
+ ExitFlag.set()\r
+ BuildTask.WaitForComplete()\r
+ Pa.CreateMakeFile(False)\r
+ EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
+ # Start task scheduler\r
+ if not BuildTask.IsOnGoing():\r
+ BuildTask.StartScheduler(self.ThreadNumber, ExitFlag)\r
+\r
+ # in case there's an interruption. we need a full version of makefile for platform\r
+ Pa.CreateMakeFile(False)\r
+ if BuildTask.HasError():\r
+ EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
+ self.MakeTime += int(round((time.time() - MakeStart)))\r
+\r
+ MakeContiue = time.time()\r
+ ExitFlag.set()\r
+ BuildTask.WaitForComplete()\r
+ self.CreateAsBuiltInf()\r
+ self.MakeTime += int(round((time.time() - MakeContiue)))\r
+ if BuildTask.HasError():\r
+ EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
\r
self.BuildReport.AddPlatformReport(Wa, MaList)\r
if MaList == []:\r
#\r
# create FDS again for the updated EFI image\r
#\r
+ GenFdsStart = time.time()\r
self._Build("fds", Wa)\r
+ self.GenFdsTime += int(round((time.time() - GenFdsStart)))\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
#\r
self._SaveMapFile (MapBuffer, Wa)\r
\r
+ def _GenFfsCmd(self):\r
+ CmdListDict = {}\r
+ GenFfsDict = GenFds.GenFfsMakefile('', GlobalData.gFdfParser, self, self.ArchList, GlobalData)\r
+ for Cmd in GenFfsDict:\r
+ tmpInf, tmpArch = GenFfsDict[Cmd]\r
+ if (tmpInf, tmpArch) not in CmdListDict.keys():\r
+ CmdListDict[tmpInf, tmpArch] = [Cmd]\r
+ else:\r
+ CmdListDict[tmpInf, tmpArch].append(Cmd)\r
+ return CmdListDict\r
+\r
## Build a platform in multi-thread mode\r
#\r
def _MultiThreadBuildPlatform(self):\r
GlobalData.gGlobalDefines['TARGET'] = BuildTarget\r
index = 0\r
for ToolChain in self.ToolChainList:\r
+ WorkspaceAutoGenTime = time.time()\r
GlobalData.gGlobalDefines['TOOLCHAIN'] = ToolChain\r
GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = ToolChain\r
GlobalData.gGlobalDefines['FAMILY'] = self.ToolChainFamily[index]\r
self.BuildReport.AddPlatformReport(Wa)\r
Wa.CreateMakeFile(False)\r
\r
+ # Add ffs build to makefile\r
+ CmdListDict = None\r
+ if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+ CmdListDict = self._GenFfsCmd()\r
+\r
# multi-thread exit flag\r
ExitFlag = threading.Event()\r
ExitFlag.clear()\r
+ self.AutoGenTime += int(round((time.time() - WorkspaceAutoGenTime)))\r
for Arch in Wa.ArchList:\r
+ AutoGenStart = time.time()\r
GlobalData.gGlobalDefines['ARCH'] = Arch\r
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
if Pa == None:\r
\r
if Ma == None:\r
continue\r
+ if Ma.CanSkipbyHash():\r
+ self.HashSkipModules.append(Ma)\r
+ continue\r
+\r
# Not to auto-gen for targets 'clean', 'cleanlib', 'cleanall', 'run', 'fds'\r
if self.Target not in ['clean', 'cleanlib', 'cleanall', 'run', 'fds']:\r
# for target which must generate AutoGen code and makefile\r
continue\r
\r
if not self.SkipAutoGen or self.Target == 'genmake':\r
- Ma.CreateMakeFile(True)\r
+ if CmdListDict and self.Fdf and (Module.File, Arch) in CmdListDict:\r
+ Ma.CreateMakeFile(True, CmdListDict[Module.File, Arch])\r
+ del CmdListDict[Module.File, Arch]\r
+ else:\r
+ Ma.CreateMakeFile(True)\r
if self.Target == "genmake":\r
continue\r
self.BuildModules.append(Ma)\r
self.Progress.Stop("done!")\r
-\r
+ self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
+ MakeStart = time.time()\r
for Ma in self.BuildModules:\r
# Generate build task for the module\r
if not Ma.IsBinaryModule:\r
Pa.CreateMakeFile(False)\r
if BuildTask.HasError():\r
EdkLogger.error("build", BUILD_ERROR, "Failed to build module", ExtraData=GlobalData.gBuildingModule)\r
+ self.MakeTime += int(round((time.time() - MakeStart)))\r
\r
+ MakeContiue = time.time()\r
#\r
# Save temp tables to a TmpTableDict.\r
#\r
ExitFlag.set()\r
BuildTask.WaitForComplete()\r
self.CreateAsBuiltInf()\r
-\r
+ self.MakeTime += int(round((time.time() - MakeContiue)))\r
#\r
# Check for build error, and raise exception if one\r
# has been signaled.\r
#\r
# Generate FD image if there's a FDF file found\r
#\r
+ GenFdsStart = time.time()\r
LaunchCommand(Wa.GenFdsCommand, os.getcwd())\r
\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)\r
+ self.GenFdsTime += int(round((time.time() - GenFdsStart)))\r
#\r
# Save MAP buffer into MAP file.\r
#\r
def CreateAsBuiltInf(self):\r
for Module in self.BuildModules:\r
Module.CreateAsBuiltInf()\r
+ for Module in self.HashSkipModules:\r
+ Module.CreateAsBuiltInf(True)\r
self.BuildModules = []\r
+ self.HashSkipModules = []\r
## Do some clean-up works when error occurred\r
def Relinquish(self):\r
OldLogLevel = EdkLogger.GetLevel()\r
else:\r
parser.error("Option %s only allows one instance in command line!" % option)\r
\r
+def LogBuildTime(Time):\r
+ if Time:\r
+ TimeDurStr = ''\r
+ TimeDur = time.gmtime(Time)\r
+ if TimeDur.tm_yday > 1:\r
+ TimeDurStr = time.strftime("%H:%M:%S", TimeDur) + ", %d day(s)" % (TimeDur.tm_yday - 1)\r
+ else:\r
+ TimeDurStr = time.strftime("%H:%M:%S", TimeDur)\r
+ return TimeDurStr\r
+ else:\r
+ return None\r
+\r
## Parse command line options\r
#\r
# Using standard Python module optparse to parse command line option of this tool.\r
Parser.add_option("-y", "--report-file", action="store", dest="ReportFile", help="Create/overwrite the report to the specified filename.")\r
Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD','LIBRARY','FLASH','DEPEX','BUILD_FLAGS','FIXED_ADDRESS','HASH','EXECUTION_ORDER'], dest="ReportType", default=[],\r
help="Flags that control the type of build report to generate. Must be one of: [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS, HASH, EXECUTION_ORDER]. "\\r
- "To specify more than one flag, repeat this option on the command line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS]")\r
+ "To specify more than one flag, repeat this option on the command line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, HASH, BUILD_FLAGS, FIXED_ADDRESS]")\r
Parser.add_option("-F", "--flag", action="store", type="string", dest="Flag",\r
help="Specify the specific option to parse EDK UNI file. Must be one of: [-c, -s]. -c is for EDK framework UNI file, and -s is for EDK UEFI UNI file. "\\r
"This option can also be specified by setting *_*_*_BUILD_FLAGS in [BuildOptions] section of platform DSC. If they are both specified, this value "\\r
Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")\r
Parser.add_option("--pcd", action="append", dest="OptionPcd", help="Set PCD value by command line. Format: \"PcdName=Value\" ")\r
Parser.add_option("-l", "--cmd-len", action="store", type="int", dest="CommandLength", help="Specify the maximum line length of build command. Default is 4096.")\r
-\r
+ Parser.add_option("--hash", action="store_true", dest="UseHashCache", default=False, help="Enable hash-based caching during build process.")\r
+ Parser.add_option("--binary-destination", action="store", type="string", dest="BinCacheDest", help="Generate a cache of binary files in the specified directory.")\r
+ Parser.add_option("--binary-source", action="store", type="string", dest="BinCacheSource", help="Consume a cache of binary files from the specified directory.")\r
+ Parser.add_option("--genfds-multi-thread", action="store_true", dest="GenfdsMultiThread", default=False, help="Enable GenFds multi thread to generate ffs file.")\r
(Opt, Args) = Parser.parse_args()\r
return (Opt, Args)\r
\r
BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration)\r
if MyBuild != None:\r
if not BuildError:\r
- MyBuild.BuildReport.GenerateReport(BuildDurationStr)\r
+ MyBuild.BuildReport.GenerateReport(BuildDurationStr, LogBuildTime(MyBuild.AutoGenTime), LogBuildTime(MyBuild.MakeTime), LogBuildTime(MyBuild.GenFdsTime))\r
MyBuild.Db.Close()\r
EdkLogger.SetLevel(EdkLogger.QUIET)\r
EdkLogger.quiet("\n- %s -" % Conclusion)\r
projects / mirror_edk2.git / blobdiff