BaseTools: Fixed issue for IgnoreAutoGen

https://bugzilla.tianocore.org/show_bug.cgi?id=2080

This patch is to improve build -u option to re-use
GlobalVar_<platformguid>_<arch>.bin file which is
introduced by multiple-process-autogen feature.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Steven Shi <steven.shi@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Acked-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
index 2e68538b1cb4f857da0dd63abc574f01f54d5c34..f488ae9d5f809f395e41f9d42a560d5e12c25c26 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
@@ -238,7 +238,7 @@ class AutoGenWorkerInProcess(mp.Process):
                     Ma.GenModuleFilesHash(GlobalData.gCacheIR)\r
                     Ma.GenPreMakefileHash(GlobalData.gCacheIR)\r
                     if Ma.CanSkipbyPreMakefileCache(GlobalData.gCacheIR):\r
-                       continue\r
+                        continue\r
 \r
                 Ma.CreateCodeFile(False)\r
                 Ma.CreateMakeFile(False,GenFfsList=FfsCmd.get((Ma.MetaFile.File, Ma.Arch),[]))\r

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index 3bb7e91154acbe7deeae88f84ceab832b2b43d63..5f28681e3146418fec307b7ccf2bccdd9fdf7bfa 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -2060,8 +2060,8 @@ class ModuleAutoGen(AutoGen):
 \r
         if not (self.MetaFile.Path, self.Arch) in gDict or \\r
            not gDict[(self.MetaFile.Path, self.Arch)].ModuleFilesHashDigest:\r
-           EdkLogger.quiet("[cache warning]: Cannot generate ModuleFilesHashDigest for module %s[%s]" %(self.MetaFile.Path, self.Arch))\r
-           return\r
+            EdkLogger.quiet("[cache warning]: Cannot generate ModuleFilesHashDigest for module %s[%s]" %(self.MetaFile.Path, self.Arch))\r
+            return\r
 \r
         # Initialze hash object\r
         m = hashlib.md5()\r

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py
index c7591253debd405957f268f3d45ea60047021a21..9dd93b9beb1214f531f7793f3364004e753f8b9a 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py
@@ -236,6 +236,10 @@ class AutoGenInfo(object):
 #\r
 class WorkSpaceInfo(AutoGenInfo):\r
     def __init__(self,Workspace, MetaFile, Target, ToolChain, Arch):\r
+        if not hasattr(self, "_Init"):\r
+            self.do_init(Workspace, MetaFile, Target, ToolChain, Arch)\r
+            self._Init = True\r
+    def do_init(self,Workspace, MetaFile, Target, ToolChain, Arch):\r
         self._SrcTimeStamp = 0\r
         self.Db = BuildDB\r
         self.BuildDatabase = self.Db.BuildObject\r
@@ -244,10 +248,35 @@ class WorkSpaceInfo(AutoGenInfo):
         self.WorkspaceDir = Workspace\r
         self.ActivePlatform = MetaFile\r
         self.ArchList = Arch\r
+        self.AutoGenObjectList = []\r
+    @property\r
+    def BuildDir(self):\r
+        return self.AutoGenObjectList[0].BuildDir\r
+\r
+    @property\r
+    def Name(self):\r
+        return self.AutoGenObjectList[0].Platform.PlatformName\r
+\r
+    @property\r
+    def FlashDefinition(self):\r
+        return self.AutoGenObjectList[0].Platform.FlashDefinition\r
+    @property\r
+    def GenFdsCommandDict(self):\r
+        FdsCommandDict = self.AutoGenObjectList[0].DataPipe.Get("FdsCommandDict")\r
+        if FdsCommandDict:\r
+            return FdsCommandDict\r
+        return {}\r
 \r
+    @cached_property\r
+    def FvDir(self):\r
+        return os.path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
 \r
 class PlatformInfo(AutoGenInfo):\r
     def __init__(self, Workspace, MetaFile, Target, ToolChain, Arch,DataPipe):\r
+        if not hasattr(self, "_Init"):\r
+            self.do_init(Workspace, MetaFile, Target, ToolChain, Arch,DataPipe)\r
+            self._Init = True\r
+    def do_init(self,Workspace, MetaFile, Target, ToolChain, Arch,DataPipe):\r
         self.Wa = Workspace\r
         self.WorkspaceDir = self.Wa.WorkspaceDir\r
         self.MetaFile = MetaFile\r

diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
index 565424a95ead392af8d3130d1e7f7aabcd33223d..1e17b6687129315e4d4b35beae44478f1a14188f 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
@@ -188,7 +188,9 @@ class PlatformAutoGen(AutoGen):
                     Ma.CreateMakeFile(CreateModuleMakeFile, FfsCommand[key])\r
                 else:\r
                     Ma.CreateMakeFile(CreateModuleMakeFile)\r
+        self.CreateLibModuelDirs()\r
 \r
+    def CreateLibModuelDirs(self):\r
         # no need to create makefile for the platform more than once\r
         if self.IsMakeFileCreated:\r
             return\r

diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
index 24942674721fe1396134b3555b8e9597d09e55c7..f9d2c216169cdfd3ccc0141f3d92bd0d4b3ca48e 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
@@ -128,7 +128,6 @@ class WorkspaceAutoGen(AutoGen):
         self.CreateBuildOptionsFile()\r
         self.CreatePcdTokenNumberFile()\r
         self.CreateModuleHashInfo()\r
-        GlobalData.gAutoGenPhase = False\r
 \r
     #\r
     # Merge Arch\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index cf82c29b7eb9b3013a457bddabcc2d4ddd677d82..13be6c33ecd57999c3f4acb333d0d71bc930b026 100755 (executable)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -54,6 +54,9 @@ import Common.GlobalData as GlobalData
 from GenFds.GenFds import GenFds, GenFdsApi\r
 import multiprocessing as mp\r
 from multiprocessing import Manager\r
+from AutoGen.DataPipe import MemoryDataPipe\r
+from AutoGen.ModuleAutoGenHelper import WorkSpaceInfo, PlatformInfo\r
+from GenFds.FdfParser import FdfParser\r
 \r
 \r
 ## standard targets of build command\r
@@ -837,7 +840,7 @@ class Build():
                         PcdMa.GenModuleFilesHash(share_data)\r
                         PcdMa.GenPreMakefileHash(share_data)\r
                         if PcdMa.CanSkipbyPreMakefileCache(share_data):\r
-                           continue\r
+                            continue\r
 \r
                     PcdMa.CreateCodeFile(False)\r
                     PcdMa.CreateMakeFile(False,GenFfsList = DataPipe.Get("FfsCommand").get((PcdMa.MetaFile.File, PcdMa.Arch),[]))\r
@@ -1218,14 +1221,24 @@ class Build():
                 mqueue.put(m)\r
 \r
             AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target}\r
+            AutoGenObject.DataPipe.DataContainer = {"Workspace_timestamp": AutoGenObject.Workspace._SrcTimeStamp}\r
+            AutoGenObject.CreateLibModuelDirs()\r
+            AutoGenObject.DataPipe.DataContainer = {"LibraryBuildDirectoryList":AutoGenObject.LibraryBuildDirectoryList}\r
+            AutoGenObject.DataPipe.DataContainer = {"ModuleBuildDirectoryList":AutoGenObject.ModuleBuildDirectoryList}\r
+            AutoGenObject.DataPipe.DataContainer = {"FdsCommandDict": AutoGenObject.Workspace.GenFdsCommandDict}\r
             self.Progress.Start("Generating makefile and code")\r
             data_pipe_file = os.path.join(AutoGenObject.BuildDir, "GlobalVar_%s_%s.bin" % (str(AutoGenObject.Guid),AutoGenObject.Arch))\r
             AutoGenObject.DataPipe.dump(data_pipe_file)\r
             autogen_rt,errorcode = self.StartAutoGen(mqueue, AutoGenObject.DataPipe, self.SkipAutoGen, PcdMaList, GlobalData.gCacheIR)\r
+            AutoGenIdFile = os.path.join(GlobalData.gConfDirectory,".AutoGenIdFile.txt")\r
+            with open(AutoGenIdFile,"w") as fw:\r
+                fw.write("Arch=%s\n" % "|".join((AutoGenObject.Workspace.ArchList)))\r
+                fw.write("BuildDir=%s\n" % AutoGenObject.Workspace.BuildDir)\r
+                fw.write("PlatformGuid=%s\n" % str(AutoGenObject.Guid))\r
             self.Progress.Stop("done!")\r
             if not autogen_rt:\r
                 self.AutoGenMgr.TerminateWorkers()\r
-                self.AutoGenMgr.join(0.1)\r
+                self.AutoGenMgr.join(1)\r
                 raise FatalError(errorcode)\r
             AutoGenObject.CreateCodeFile(False)\r
             AutoGenObject.CreateMakeFile(False)\r
@@ -1778,6 +1791,7 @@ class Build():
                     # Save MAP buffer into MAP file.\r
                     #\r
                     self._SaveMapFile (MapBuffer, Wa)\r
+                self.CreateGuidedSectionToolsFile(Wa)\r
 \r
     ## Build active module for different build targets, different tool chains and different archs\r
     #\r
@@ -1852,9 +1866,9 @@ class Build():
                                 Ma.GenModuleFilesHash(GlobalData.gCacheIR)\r
                                 Ma.GenPreMakefileHash(GlobalData.gCacheIR)\r
                                 if Ma.CanSkipbyPreMakefileCache(GlobalData.gCacheIR):\r
-                                   self.HashSkipModules.append(Ma)\r
-                                   EdkLogger.quiet("cache hit: %s[%s]" % (Ma.MetaFile.Path, Ma.Arch))\r
-                                   continue\r
+                                    self.HashSkipModules.append(Ma)\r
+                                    EdkLogger.quiet("cache hit: %s[%s]" % (Ma.MetaFile.Path, Ma.Arch))\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
@@ -1987,121 +2001,217 @@ class Build():
             tmpInf, tmpArch = GenFfsDict[Cmd]\r
             CmdSetDict[tmpInf, tmpArch].add(Cmd)\r
         return CmdSetDict\r
+    def VerifyAutoGenFiles(self):\r
+        AutoGenIdFile = os.path.join(GlobalData.gConfDirectory,".AutoGenIdFile.txt")\r
+        try:\r
+            with open(AutoGenIdFile) as fd:\r
+                lines = fd.readlines()\r
+        except:\r
+            return None\r
+        for line in lines:\r
+            if "Arch" in line:\r
+                ArchList = line.strip().split("=")[1].split("|")\r
+            if "BuildDir" in line:\r
+                BuildDir = line.split("=")[1].strip()\r
+            if "PlatformGuid" in line:\r
+                PlatformGuid = line.split("=")[1].strip()\r
+        GlobalVarList = []\r
+        for arch in ArchList:\r
+            global_var = os.path.join(BuildDir, "GlobalVar_%s_%s.bin" % (str(PlatformGuid),arch))\r
+            if not os.path.exists(global_var):\r
+                return None\r
+            GlobalVarList.append(global_var)\r
+        for global_var in GlobalVarList:\r
+            data_pipe = MemoryDataPipe()\r
+            data_pipe.load(global_var)\r
+            target = data_pipe.Get("P_Info").get("Target")\r
+            toolchain = data_pipe.Get("P_Info").get("ToolChain")\r
+            archlist = data_pipe.Get("P_Info").get("ArchList")\r
+            Arch = data_pipe.Get("P_Info").get("Arch")\r
+            active_p = data_pipe.Get("P_Info").get("ActivePlatform")\r
+            workspacedir = data_pipe.Get("P_Info").get("WorkspaceDir")\r
+            PackagesPath = os.getenv("PACKAGES_PATH")\r
+            mws.setWs(workspacedir, PackagesPath)\r
+            LibraryBuildDirectoryList = data_pipe.Get("LibraryBuildDirectoryList")\r
+            ModuleBuildDirectoryList = data_pipe.Get("ModuleBuildDirectoryList")\r
+\r
+            for m_build_dir in LibraryBuildDirectoryList:\r
+                if not os.path.exists(os.path.join(m_build_dir,GenMake.BuildFile._FILE_NAME_[GenMake.gMakeType])):\r
+                    return None\r
+            for m_build_dir in ModuleBuildDirectoryList:\r
+                if not os.path.exists(os.path.join(m_build_dir,GenMake.BuildFile._FILE_NAME_[GenMake.gMakeType])):\r
+                    return None\r
+            Wa = WorkSpaceInfo(\r
+                workspacedir,active_p,target,toolchain,archlist\r
+                )\r
+            Pa = PlatformInfo(Wa, active_p, target, toolchain, Arch,data_pipe)\r
+            Wa.AutoGenObjectList.append(Pa)\r
+        return Wa\r
+    def SetupMakeSetting(self,Wa):\r
+        BuildModules = []\r
+        for Pa in Wa.AutoGenObjectList:\r
+            for m in Pa._MbList:\r
+                ma = ModuleAutoGen(Wa,m.MetaFile, Pa.BuildTarget, Wa.ToolChain, Pa.Arch, Pa.MetaFile,Pa.DataPipe)\r
+                BuildModules.append(ma)\r
+        fdf_file = Wa.FlashDefinition\r
+        if fdf_file:\r
+            Fdf = FdfParser(fdf_file.Path)\r
+            Fdf.ParseFile()\r
+            GlobalData.gFdfParser = Fdf\r
+            if Fdf.CurrentFdName and Fdf.CurrentFdName in Fdf.Profile.FdDict:\r
+                FdDict = Fdf.Profile.FdDict[Fdf.CurrentFdName]\r
+                for FdRegion in FdDict.RegionList:\r
+                    if str(FdRegion.RegionType) is 'FILE' and self.Platform.VpdToolGuid in str(FdRegion.RegionDataList):\r
+                        if int(FdRegion.Offset) % 8 != 0:\r
+                            EdkLogger.error("build", FORMAT_INVALID, 'The VPD Base Address %s must be 8-byte aligned.' % (FdRegion.Offset))\r
+            Wa.FdfProfile = Fdf.Profile\r
+            self.Fdf = Fdf\r
+        else:\r
+            self.Fdf = None\r
+        return BuildModules\r
 \r
     ## Build a platform in multi-thread mode\r
     #\r
+    def PerformAutoGen(self,BuildTarget,ToolChain):\r
+        WorkspaceAutoGenTime = time.time()\r
+        Wa = WorkspaceAutoGen(\r
+                self.WorkspaceDir,\r
+                self.PlatformFile,\r
+                BuildTarget,\r
+                ToolChain,\r
+                self.ArchList,\r
+                self.BuildDatabase,\r
+                self.TargetTxt,\r
+                self.ToolDef,\r
+                self.Fdf,\r
+                self.FdList,\r
+                self.FvList,\r
+                self.CapList,\r
+                self.SkuId,\r
+                self.UniFlag,\r
+                self.Progress\r
+                )\r
+        self.Fdf = Wa.FdfFile\r
+        self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
+        self.BuildReport.AddPlatformReport(Wa)\r
+        Wa.CreateMakeFile(False)\r
+\r
+                # Add ffs build to makefile\r
+        CmdListDict = {}\r
+        if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+            CmdListDict = self._GenFfsCmd(Wa.ArchList)\r
+\r
+        # Add Platform and Package level hash in share_data for module hash calculation later\r
+        if GlobalData.gBinCacheSource or GlobalData.gBinCacheDest:\r
+            GlobalData.gCacheIR[('PlatformHash')] = GlobalData.gPlatformHash\r
+            for PkgName in GlobalData.gPackageHash.keys():\r
+                GlobalData.gCacheIR[(PkgName, 'PackageHash')] = GlobalData.gPackageHash[PkgName]\r
+\r
+        self.AutoGenTime += int(round((time.time() - WorkspaceAutoGenTime)))\r
+        BuildModules = []\r
+        TotalModules = []\r
+        for Arch in Wa.ArchList:\r
+            PcdMaList    = []\r
+            AutoGenStart = time.time()\r
+            GlobalData.gGlobalDefines['ARCH'] = Arch\r
+            Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
+            if Pa is None:\r
+                continue\r
+            ModuleList = []\r
+            for Inf in Pa.Platform.Modules:\r
+                ModuleList.append(Inf)\r
+                    # Add the INF only list in FDF\r
+            if GlobalData.gFdfParser is not None:\r
+                for InfName in GlobalData.gFdfParser.Profile.InfList:\r
+                    Inf = PathClass(NormPath(InfName), self.WorkspaceDir, Arch)\r
+                    if Inf in Pa.Platform.Modules:\r
+                        continue\r
+                    ModuleList.append(Inf)\r
+            Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}\r
+            Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}\r
+            Pa.DataPipe.DataContainer = {"CommandTarget": self.Target}\r
+            Pa.CreateLibModuelDirs()\r
+            Pa.DataPipe.DataContainer = {"LibraryBuildDirectoryList":Pa.LibraryBuildDirectoryList}\r
+            Pa.DataPipe.DataContainer = {"ModuleBuildDirectoryList":Pa.ModuleBuildDirectoryList}\r
+            Pa.DataPipe.DataContainer = {"FdsCommandDict": Wa.GenFdsCommandDict}\r
+            ModuleCodaFile = {}\r
+            for ma in Pa.ModuleAutoGenList:\r
+                ModuleCodaFile[(ma.MetaFile.File,ma.MetaFile.Root,ma.Arch,ma.MetaFile.Path)] = [item.Target for item in ma.CodaTargetList]\r
+            Pa.DataPipe.DataContainer = {"ModuleCodaFile":ModuleCodaFile}\r
+            for Module in ModuleList:\r
+                        # Get ModuleAutoGen object to generate C code file and makefile\r
+                Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile,Pa.DataPipe)\r
+\r
+                if Ma is None:\r
+                    continue\r
+                if Ma.PcdIsDriver:\r
+                    Ma.PlatformInfo = Pa\r
+                    Ma.Workspace = Wa\r
+                    PcdMaList.append(Ma)\r
+                TotalModules.append(Ma)\r
+                # Initialize all modules in tracking to 'FAIL'\r
+                GlobalData.gModuleBuildTracking[Ma] = 'FAIL'\r
+\r
+\r
+            mqueue = mp.Queue()\r
+            for m in Pa.GetAllModuleInfo:\r
+                mqueue.put(m)\r
+            data_pipe_file = os.path.join(Pa.BuildDir, "GlobalVar_%s_%s.bin" % (str(Pa.Guid),Pa.Arch))\r
+            Pa.DataPipe.dump(data_pipe_file)\r
+\r
+            autogen_rt, errorcode = self.StartAutoGen(mqueue, Pa.DataPipe, self.SkipAutoGen, PcdMaList,GlobalData.gCacheIR)\r
+\r
+            # Skip cache hit modules\r
+            if GlobalData.gBinCacheSource:\r
+                for Ma in TotalModules:\r
+                    if (Ma.MetaFile.Path, Ma.Arch) in GlobalData.gCacheIR and \\r
+                        GlobalData.gCacheIR[(Ma.MetaFile.Path, Ma.Arch)].PreMakeCacheHit:\r
+                            self.HashSkipModules.append(Ma)\r
+                            continue\r
+                    if (Ma.MetaFile.Path, Ma.Arch) in GlobalData.gCacheIR and \\r
+                        GlobalData.gCacheIR[(Ma.MetaFile.Path, Ma.Arch)].MakeCacheHit:\r
+                            self.HashSkipModules.append(Ma)\r
+                            continue\r
+                    BuildModules.append(Ma)\r
+            else:\r
+                BuildModules.extend(TotalModules)\r
+\r
+            if not autogen_rt:\r
+                self.AutoGenMgr.TerminateWorkers()\r
+                self.AutoGenMgr.join(1)\r
+                raise FatalError(errorcode)\r
+            self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
+        AutoGenIdFile = os.path.join(GlobalData.gConfDirectory,".AutoGenIdFile.txt")\r
+        with open(AutoGenIdFile,"w") as fw:\r
+            fw.write("Arch=%s\n" % "|".join((Wa.ArchList)))\r
+            fw.write("BuildDir=%s\n" % Wa.BuildDir)\r
+            fw.write("PlatformGuid=%s\n" % str(Wa.AutoGenObjectList[0].Guid))\r
+        self.Progress.Stop("done!")\r
+        return Wa, BuildModules\r
+\r
     def _MultiThreadBuildPlatform(self):\r
         SaveFileOnChange(self.PlatformBuildPath, '# DO NOT EDIT \n# FILE auto-generated\n', False)\r
         for BuildTarget in self.BuildTargetList:\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
                 index += 1\r
-                Wa = WorkspaceAutoGen(\r
-                        self.WorkspaceDir,\r
-                        self.PlatformFile,\r
-                        BuildTarget,\r
-                        ToolChain,\r
-                        self.ArchList,\r
-                        self.BuildDatabase,\r
-                        self.TargetTxt,\r
-                        self.ToolDef,\r
-                        self.Fdf,\r
-                        self.FdList,\r
-                        self.FvList,\r
-                        self.CapList,\r
-                        self.SkuId,\r
-                        self.UniFlag,\r
-                        self.Progress\r
-                        )\r
-                self.Fdf = Wa.FdfFile\r
-                self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
-                self.BuildReport.AddPlatformReport(Wa)\r
-                Wa.CreateMakeFile(False)\r
-\r
-                # Add ffs build to makefile\r
-                CmdListDict = {}\r
-                if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
-                    CmdListDict = self._GenFfsCmd(Wa.ArchList)\r
-\r
-                # Add Platform and Package level hash in share_data for module hash calculation later\r
-                if GlobalData.gBinCacheSource or GlobalData.gBinCacheDest:\r
-                    GlobalData.gCacheIR[('PlatformHash')] = GlobalData.gPlatformHash\r
-                    for PkgName in GlobalData.gPackageHash.keys():\r
-                        GlobalData.gCacheIR[(PkgName, 'PackageHash')] = GlobalData.gPackageHash[PkgName]\r
-\r
-                # multi-thread exit flag\r
                 ExitFlag = threading.Event()\r
                 ExitFlag.clear()\r
-                self.AutoGenTime += int(round((time.time() - WorkspaceAutoGenTime)))\r
-                self.BuildModules = []\r
-                TotalModules = []\r
-                for Arch in Wa.ArchList:\r
-                    PcdMaList    = []\r
-                    AutoGenStart = time.time()\r
-                    GlobalData.gGlobalDefines['ARCH'] = Arch\r
-                    Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
-                    if Pa is None:\r
-                        continue\r
-                    ModuleList = []\r
-                    for Inf in Pa.Platform.Modules:\r
-                        ModuleList.append(Inf)\r
-                    # Add the INF only list in FDF\r
-                    if GlobalData.gFdfParser is not None:\r
-                        for InfName in GlobalData.gFdfParser.Profile.InfList:\r
-                            Inf = PathClass(NormPath(InfName), self.WorkspaceDir, Arch)\r
-                            if Inf in Pa.Platform.Modules:\r
-                                continue\r
-                            ModuleList.append(Inf)\r
-                    Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}\r
-                    Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}\r
-                    Pa.DataPipe.DataContainer = {"CommandTarget": self.Target}\r
-                    for Module in ModuleList:\r
-                        # Get ModuleAutoGen object to generate C code file and makefile\r
-                        Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain, Arch, self.PlatformFile,Pa.DataPipe)\r
-\r
-                        if Ma is None:\r
-                            continue\r
-                        if Ma.PcdIsDriver:\r
-                            Ma.PlatformInfo = Pa\r
-                            Ma.Workspace = Wa\r
-                            PcdMaList.append(Ma)\r
-                        TotalModules.append(Ma)\r
-                        # Initialize all modules in tracking to 'FAIL'\r
-                        GlobalData.gModuleBuildTracking[Ma] = 'FAIL'\r
-\r
-                    mqueue = mp.Queue()\r
-                    for m in Pa.GetAllModuleInfo:\r
-                        mqueue.put(m)\r
-                    data_pipe_file = os.path.join(Pa.BuildDir, "GlobalVar_%s_%s.bin" % (str(Pa.Guid),Pa.Arch))\r
-                    Pa.DataPipe.dump(data_pipe_file)\r
-                    autogen_rt, errorcode = self.StartAutoGen(mqueue, Pa.DataPipe, self.SkipAutoGen, PcdMaList,  GlobalData.gCacheIR)\r
-\r
-                    # Skip cache hit modules\r
-                    if GlobalData.gBinCacheSource:\r
-                        for Ma in TotalModules:\r
-                            if (Ma.MetaFile.Path, Ma.Arch) in GlobalData.gCacheIR and \\r
-                                GlobalData.gCacheIR[(Ma.MetaFile.Path, Ma.Arch)].PreMakeCacheHit:\r
-                                    self.HashSkipModules.append(Ma)\r
-                                    continue\r
-                            if (Ma.MetaFile.Path, Ma.Arch) in GlobalData.gCacheIR and \\r
-                                GlobalData.gCacheIR[(Ma.MetaFile.Path, Ma.Arch)].MakeCacheHit:\r
-                                    self.HashSkipModules.append(Ma)\r
-                                    continue\r
-                            self.BuildModules.append(Ma)\r
+                if self.SkipAutoGen:\r
+                    Wa = self.VerifyAutoGenFiles()\r
+                    if Wa is None:\r
+                        Wa, self.BuildModules = self.PerformAutoGen(BuildTarget,ToolChain)\r
                     else:\r
-                        self.BuildModules.extend(TotalModules)\r
-\r
-                    if not autogen_rt:\r
-                        self.AutoGenMgr.TerminateWorkers()\r
-                        self.AutoGenMgr.join(0.1)\r
-                        raise FatalError(errorcode)\r
-                self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
-                self.Progress.Stop("done!")\r
+                        GlobalData.gAutoGenPhase = True\r
+                        self.BuildModules = self.SetupMakeSetting(Wa)\r
+                else:\r
+                    Wa, self.BuildModules = self.PerformAutoGen(BuildTarget,ToolChain)\r
+                Pa = Wa.AutoGenObjectList[0]\r
+                GlobalData.gAutoGenPhase = False\r
 \r
                 if GlobalData.gBinCacheSource:\r
                     EdkLogger.quiet("Total cache hit driver num: %s, cache miss driver num: %s" % (len(set(self.HashSkipModules)), len(set(self.BuildModules))))\r
@@ -2136,14 +2246,13 @@ class Build():
                             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
+\r
                     if BuildTask.HasError():\r
                         self.invalidateHash()\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
                 #\r
                 #\r
                 # All modules have been put in build tasks queue. Tell task scheduler\r
@@ -2175,13 +2284,8 @@ class Build():
                     #\r
                     # Get Module List\r
                     #\r
-                    ModuleList = {}\r
-                    for Pa in Wa.AutoGenObjectList:\r
-                        for Ma in Pa.ModuleAutoGenList:\r
-                            if Ma is None:\r
-                                continue\r
-                            if not Ma.IsLibrary:\r
-                                ModuleList[Ma.Guid.upper()] = Ma\r
+                    ModuleList = {ma.Guid.upper():ma for ma in self.BuildModules}\r
+\r
                     #\r
                     # Rebase module to the preferred memory address before GenFds\r
                     #\r
@@ -2206,29 +2310,13 @@ class Build():
                     # Save MAP buffer into MAP file.\r
                     #\r
                     self._SaveMapFile(MapBuffer, Wa)\r
+                self.CreateGuidedSectionToolsFile(Wa)\r
         self.invalidateHash()\r
-\r
     ## Generate GuidedSectionTools.txt in the FV directories.\r
     #\r
-    def CreateGuidedSectionToolsFile(self):\r
+    def CreateGuidedSectionToolsFile(self,Wa):\r
         for BuildTarget in self.BuildTargetList:\r
             for ToolChain in self.ToolChainList:\r
-                Wa = WorkspaceAutoGen(\r
-                        self.WorkspaceDir,\r
-                        self.PlatformFile,\r
-                        BuildTarget,\r
-                        ToolChain,\r
-                        self.ArchList,\r
-                        self.BuildDatabase,\r
-                        self.TargetTxt,\r
-                        self.ToolDef,\r
-                        self.Fdf,\r
-                        self.FdList,\r
-                        self.FvList,\r
-                        self.CapList,\r
-                        self.SkuId,\r
-                        self.UniFlag\r
-                        )\r
                 FvDir = Wa.FvDir\r
                 if not os.path.exists(FvDir):\r
                     continue\r
@@ -2285,7 +2373,6 @@ class Build():
                 self._BuildPlatform()\r
             else:\r
                 self._MultiThreadBuildPlatform()\r
-            self.CreateGuidedSectionToolsFile()\r
         else:\r
             self.SpawnMode = False\r
             self._BuildModule()\r