From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: steven.shi@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Tue, 28 May 2019 01:51:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 May 2019 01:51:53 -0700 X-ExtLoop1: 1 Received: from jshi19-mobl.ccr.corp.intel.com ([10.254.209.247]) by fmsmga005.fm.intel.com with ESMTP; 28 May 2019 01:51:49 -0700 From: "Steven Shi" To: devel@edk2.groups.io Cc: liming.gao@intel.com, bob.c.feng@intel.com, christian.rodriguez@intel.com, zhijux.fan@intel.com Subject: [PATCH] BaseTools:Extend the binary cache to support library cache Date: Tue, 28 May 2019 16:51:39 +0800 Message-Id: <20190528085139.14716-1-steven.shi@intel.com> X-Mailer: git-send-email 2.17.1.windows.2 https://bugzilla.tianocore.org/show_bug.cgi?id=1797 Current binary cache doesn't support to save and restore the library module. If a driver module cache miss happen, all its dependency library modules need rebuild which is very time-consuming. This patch is to entend the binary cache to support library. Cc: Liming Gao Cc: Bob Feng Cc: Christian Rodriguez Signed-off-by: Steven Shi --- BaseTools/Source/Python/AutoGen/AutoGen.py | 17 ++++++++++++++--- BaseTools/Source/Python/build/build.py | 3 ++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index a5bef4f7c6..aeb63f52c5 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -2578,7 +2578,7 @@ class ModuleAutoGen(AutoGen): self.AutoGenDepSet = set() self.ReferenceModules = [] self.ConstPcd = {} - + self.CacheRestored = False def __repr__(self): return "%s [%s]" % (self.MetaFile, self.Arch) @@ -3906,6 +3906,12 @@ class ModuleAutoGen(AutoGen): ModuleFile = path.join(self.OutputDir, self.Name + '.inf') if os.path.exists(ModuleFile): shutil.copy2(ModuleFile, FileDir) + else: + OutputDir = self.OutputDir.replace('\\', '/').strip('/') + DebugDir = self.DebugDir.replace('\\', '/').strip('/') + for Item in self.CodaTargetList: + File = Item.Target.Path.replace('\\', '/').strip('/').replace(DebugDir, '').replace(OutputDir, '').strip('/') + self.OutputFile.add(File) if not self.OutputFile: Ma = self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain] self.OutputFile = Ma.Binaries @@ -3949,6 +3955,7 @@ class ModuleAutoGen(AutoGen): destination_dir = os.path.dirname(destination_file) CreateDirectory(destination_dir) shutil.copy2(File, destination_dir) + self.CacheRestored = True if self.Name == "PcdPeim" or self.Name == "PcdDxe": CreatePcdDatabaseCode(self, TemplateString(), TemplateString()) return True @@ -3987,7 +3994,9 @@ class ModuleAutoGen(AutoGen): self.GenFfsList = GenFfsList if not self.IsLibrary and CreateLibraryMakeFile: for LibraryAutoGen in self.LibraryAutoGenList: - LibraryAutoGen.CreateMakeFile() + # Only create makefile for libraries which have not been restored + if not LibraryAutoGen.CacheRestored: + LibraryAutoGen.CreateMakeFile() if self.CanSkip(): return @@ -4030,7 +4039,9 @@ class ModuleAutoGen(AutoGen): if not self.IsLibrary and CreateLibraryCodeFile: for LibraryAutoGen in self.LibraryAutoGenList: - LibraryAutoGen.CreateCodeFile() + # Only create autogen code for libraries which have not been restored + if not LibraryAutoGen.CacheRestored: + LibraryAutoGen.CreateCodeFile() if self.CanSkip(): return diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 80ceb98310..f1f4c07980 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -341,7 +341,8 @@ class ModuleMakeUnit(BuildUnit): # @param Target The build target name, one of gSupportedTarget # def __init__(self, Obj, Target): - Dependency = [ModuleMakeUnit(La, Target) for La in Obj.LibraryAutoGenList] + # Skip the dependency modules which are already restored from cache + Dependency = [ModuleMakeUnit(La, Target) for La in Obj.LibraryAutoGenList if not La.CacheRestored] BuildUnit.__init__(self, Obj, Obj.BuildCommand, Target, Dependency, Obj.MakeFileDir) if Target in [None, "", "all"]: self.Target = "tbuild" -- 2.17.1.windows.2