From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: steven.shi@intel.com) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Mon, 10 Jun 2019 22:53:44 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jun 2019 22:53:43 -0700 X-ExtLoop1: 1 Received: from jshi19-mobl.ccr.corp.intel.com ([10.239.197.120]) by orsmga003.jf.intel.com with ESMTP; 10 Jun 2019 22:53:42 -0700 From: "Steven Shi" To: devel@edk2.groups.io Cc: liming.gao@intel.com, bob.c.feng@intel.com, christian.rodriguez@intel.com Subject: [PATCH] BaseTools: Cannot store library cache of different arch together Date: Tue, 11 Jun 2019 13:53:27 +0800 Message-Id: <20190611055327.18508-1-steven.shi@intel.com> X-Mailer: git-send-email 2.17.1.windows.2 https://bugzilla.tianocore.org/show_bug.cgi?id=1895 Build cache cannot store cache for the same library modules in different arch together. E.g. Both the below IA32 and X64 arch BaseLib caches should exist after build Ovmf3264, but now only the one in X64 arch exist. The reason is the current Basetool use a set() to same all library AutoGen objects, but the different arch lib AutoGen objects have same __hash_ value which comes from the lib MetaFile(The path of module file): def __hash__(self): return hash(self.MetaFile) So the different arch lib AutoGen objects are duplicated one to the set() and only one can exist. This is why the Basetool can only store one arch cache for library. This patch avoid to use the set() as the container to save the library and module objects because the objects might have same __hash__ value. Cc: Liming Gao Cc: Bob Feng Cc: Christian Rodriguez Signed-off-by: Steven Shi --- BaseTools/Source/Python/build/build.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 0855d4561c..f7a79cbbab 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2203,21 +2203,14 @@ class Build(): RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True) def CreateAsBuiltInf(self): - all_lib_set = set() - all_mod_set = set() for Module in self.BuildModules: Module.CreateAsBuiltInf() - all_mod_set.add(Module) + for lib in Module.LibraryAutoGenList: + lib.CreateAsBuiltInf(True) for Module in self.HashSkipModules: Module.CreateAsBuiltInf(True) - all_mod_set.add(Module) - for Module in all_mod_set: for lib in Module.LibraryAutoGenList: - all_lib_set.add(lib) - for lib in all_lib_set: - lib.CreateAsBuiltInf(True) - all_lib_set.clear() - all_mod_set.clear() + lib.CreateAsBuiltInf(True) self.BuildModules = [] self.HashSkipModules = [] ## Do some clean-up works when error occurred -- 2.17.1.windows.2