BaseTools: Move CreateAsBuiltInf into AutoGenWorker for parallel

AsBuiltInf can be created during AutoGen phase. Move CreateAsBuiltInf
into AutoGenWorker to make this step run in parallel.

Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
index 017f67639935328c3945cf6aada22374f66ed7c3..0425f1ab0bd18108632491875eee53231b1ce05e 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
@@ -280,7 +280,7 @@ class AutoGenWorkerInProcess(mp.Process):
 \r
                 Ma.CreateCodeFile(False)\r
                 Ma.CreateMakeFile(False,GenFfsList=FfsCmd.get((Ma.MetaFile.Path, Ma.Arch),[]))\r
-\r
+                Ma.CreateAsBuiltInf()\r
                 if GlobalData.gBinCacheSource and CommandTarget in [None, "", "all"]:\r
                     try:\r
                         CacheResult = Ma.CanSkipbyMakeCache()\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 59ceacfed027ccb73438d447754ea22f91e5f1b0..c4cfe38ad96af90e6d0f481e8f8d0dd64b3f0728 100755 (executable)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -873,7 +873,7 @@ class Build():
 \r
                     PcdMa.CreateCodeFile(False)\r
                     PcdMa.CreateMakeFile(False,GenFfsList = DataPipe.Get("FfsCommand").get((PcdMa.MetaFile.Path, PcdMa.Arch),[]))\r
-\r
+                    PcdMa.CreateAsBuiltInf()\r
                     # Force cache miss for PCD driver\r
                     if GlobalData.gBinCacheSource and self.Target in [None, "", "all"]:\r
                         cqueue.put((PcdMa.MetaFile.Path, PcdMa.Arch, "MakeCache", False))\r
@@ -1265,7 +1265,6 @@ class Build():
         if BuildModule:\r
             BuildCommand = BuildCommand + [Target]\r
             LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)\r
-            self.CreateAsBuiltInf()\r
             if GlobalData.gBinCacheDest:\r
                 self.GenDestCache()\r
             elif GlobalData.gUseHashCache and not GlobalData.gBinCacheSource:\r
@@ -2276,7 +2275,6 @@ class Build():
                 #\r
                 ExitFlag.set()\r
                 BuildTask.WaitForComplete()\r
-                self.CreateAsBuiltInf()\r
                 if GlobalData.gBinCacheDest:\r
                     self.GenDestCache()\r
                 elif GlobalData.gUseHashCache and not GlobalData.gBinCacheSource:\r