From nobody Thu Apr 25 19:42:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+45507+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45507+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1565686267; cv=none; d=zoho.com; s=zohoarc; b=cWr1reWMDT3QRptWmP0y/i6bjZUsuebKVlASBDHNgq3l+lQfuu23CHtQlD93ut4EDPckW5yNYgQ1fur+IMJqqH3NgHA295XRLxfcgA0gBsiJVFzy0G8/E7KfewXexqgF3gbxlVNwhhTc5Uzhef5yaD/JyChcWvp/4UrXIVysjZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565686267; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=hBO2Cbmx+ko/TIqWXplzUX5HZlrCPMNTpDlc21bt36c=; b=l06PuXSrkZ11CYO/pLqzXhfPVme33EmRVqSunjSJLugN8YvAQiAaphrVMBuG5qUYnxCtuUMRHI8zWQfZ1bUIZjH2q+Abd55elUPQLnw9i1ZHCSUTD+ttQy+cXZHBjMLfaUXthnLJVG8OQsZm3m+5m14QWcJTXRvzb0cqVv8rw14= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45507+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1565686267287231.29777070172418; Tue, 13 Aug 2019 01:51:07 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Tue, 13 Aug 2019 01:51:06 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Aug 2019 01:51:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,380,1559545200"; d="scan'208";a="200414573" X-Received: from jshi19-mobl.ccr.corp.intel.com ([10.254.211.145]) by fmsmga004.fm.intel.com with ESMTP; 13 Aug 2019 01:51:04 -0700 From: "Steven Shi" To: devel@edk2.groups.io Cc: liming.gao@intel.com, bob.c.feng@intel.com, christian.rodriguez@intel.com, michael.johnson@intel.com, "Shi, Steven" Subject: [edk2-devel] [PATCH v3 3/5] BaseTools: Change the [Arch][Name] module key in Build cache Date: Tue, 13 Aug 2019 16:50:53 +0800 Message-Id: <20190813085055.23208-4-steven.shi@intel.com> In-Reply-To: <20190813085055.23208-1-steven.shi@intel.com> References: <20190813085055.23208-1-steven.shi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,steven.shi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1565686266; bh=d1sTKpK5hfx5B+NHacyauT/nf50jy4mzuN8JqPLYRpU=; h=Cc:Date:From:Reply-To:Subject:To; b=uQ4rl0ukXJyj0rwhPLL/p50wLk328vjgE52sU6EyoYm+gBUXPjW+UP/kF0kx3Lpfcig FBNx5aDAMdoxvXrXEfzDPZHL/u66ouiDifbHSxgUQDeIh8fgCW8EYTkHNvj1mb7WUR6ho oi/HP477YOxFssjfI75LjmvxKH4wASDb1Wc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Shi, Steven" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1951 Current build cache use the module's [self.Arch][self.Name] info as the ModuleAutoGen object key in hash list and dictionary. The [self.Arch][self.Name] is not safe as the module key because there could be two modules with same module name and arch name in one platform. E.g. A platform can override a module or library instance in another different path, the overriding module can has the same module name and arch name as the original one. Directly use the ModuleAutoGen obj self as the key, because the obj __hash__ and __repr__ attributes already contain the full path and arch name. Cc: Liming Gao Cc: Bob Feng Signed-off-by: Steven Shi --- BaseTools/Source/Python/AutoGen/GenMake.py | 6 +----- BaseTools/Source/Python/build/build.py | 49 +++++++++++++++++++++-----= ----------------------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index 79387856bd..de820eeb2f 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -940,16 +940,12 @@ cleanlib: continue headerFileDependencySet.add(aFileName) =20 - # Ensure that gModuleBuildTracking has been initialized per archit= ecture - if self._AutoGenObject.Arch not in GlobalData.gModuleBuildTracking: - GlobalData.gModuleBuildTracking[self._AutoGenObject.Arch] =3D = dict() - # Check if a module dependency header file is missing from the mod= ule's MetaFile for aFile in headerFileDependencySet: if aFile in headerFilesInMetaFileSet: continue if GlobalData.gUseHashCache: - GlobalData.gModuleBuildTracking[self._AutoGenObject.Arch][= self._AutoGenObject] =3D 'FAIL_METAFILE' + GlobalData.gModuleBuildTracking[self._AutoGenObject] =3D '= FAIL_METAFILE' EdkLogger.warn("build","Module MetaFile [Sources] is missing l= ocal header!", ExtraData =3D "Local Header: " + aFile + " not fou= nd in " + self._AutoGenObject.MetaFile.Path ) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index a35a29b150..3e6cfd9faf 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -630,12 +630,11 @@ class BuildTask: =20 # Set the value used by hash invalidation flow in GlobalData.gModu= leBuildTracking to 'SUCCESS' # If Module or Lib is being tracked, it did not fail header check = test, and built successfully - if (self.BuildItem.BuildObject.Arch in GlobalData.gModuleBuildTrac= king and - self.BuildItem.BuildObject in GlobalData.gModuleBuildTracking[s= elf.BuildItem.BuildObject.Arch] and - GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject.Arch= ][self.BuildItem.BuildObject] !=3D 'FAIL_METAFILE' and + if (self.BuildItem.BuildObject in GlobalData.gModuleBuildTracking = and + GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject] != =3D 'FAIL_METAFILE' and not BuildTask._ErrorFlag.isSet() ): - GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject.Arc= h][self.BuildItem.BuildObject] =3D 'SUCCESS' + GlobalData.gModuleBuildTracking[self.BuildItem.BuildObject] = =3D 'SUCCESS' =20 # indicate there's a thread is available for another build task BuildTask._RunningQueueLock.acquire() @@ -1171,25 +1170,24 @@ class Build(): return =20 # GlobalData.gModuleBuildTracking contains only modules or libs th= at cannot be skipped by hash - for moduleAutoGenObjArch in GlobalData.gModuleBuildTracking.keys(): - for moduleAutoGenObj in GlobalData.gModuleBuildTracking[module= AutoGenObjArch].keys(): - # Skip invalidating for Successful Module/Lib builds - if GlobalData.gModuleBuildTracking[moduleAutoGenObjArch][m= oduleAutoGenObj] =3D=3D 'SUCCESS': - continue + for Ma in GlobalData.gModuleBuildTracking: + # Skip invalidating for Successful Module/Lib builds + if GlobalData.gModuleBuildTracking[Ma] =3D=3D 'SUCCESS': + continue =20 - # The module failed to build, failed to start building, or= failed the header check test from this point on + # The module failed to build, failed to start building, or fai= led the header check test from this point on =20 - # Remove .hash from build - ModuleHashFile =3D os.path.join(moduleAutoGenObj.BuildDir,= moduleAutoGenObj.Name + ".hash") - if os.path.exists(ModuleHashFile): - os.remove(ModuleHashFile) + # Remove .hash from build + ModuleHashFile =3D os.path.join(Ma.BuildDir, Ma.Name + ".hash") + if os.path.exists(ModuleHashFile): + os.remove(ModuleHashFile) =20 - # Remove .hash file from cache - if GlobalData.gBinCacheDest: - FileDir =3D os.path.join(GlobalData.gBinCacheDest, mod= uleAutoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.B= aseName) - HashFile =3D os.path.join(FileDir, moduleAutoGenObj.Na= me + '.hash') - if os.path.exists(HashFile): - os.remove(HashFile) + # Remove .hash file from cache + if GlobalData.gBinCacheDest: + FileDir =3D os.path.join(GlobalData.gBinCacheDest, Ma.Plat= formInfo.OutputDir, Ma.BuildTarget + "_" + Ma.ToolChain, Ma.Arch, Ma.Source= Dir, Ma.MetaFile.BaseName) + HashFile =3D os.path.join(FileDir, Ma.Name + '.hash') + if os.path.exists(HashFile): + os.remove(HashFile) =20 ## Build a module or platform # @@ -1889,10 +1887,7 @@ class Build(): =20 self.BuildModules.append(Ma) # Initialize all modules in tracking to 'FAIL' - if Ma.Arch not in GlobalData.gModuleBuildTrack= ing: - GlobalData.gModuleBuildTracking[Ma.Arch] = =3D dict() - if Ma not in GlobalData.gModuleBuildTracking[M= a.Arch]: - GlobalData.gModuleBuildTracking[Ma.Arch][M= a] =3D 'FAIL' + GlobalData.gModuleBuildTracking[Ma] =3D 'FAIL' self.AutoGenTime +=3D int(round((time.time() - AutoGen= Start))) MakeStart =3D time.time() for Ma in self.BuildModules: @@ -2075,10 +2070,8 @@ class Build(): PcdMaList.append(Ma) TotalModules.append(Ma) # Initialize all modules in tracking to 'FAIL' - if Ma.Arch not in GlobalData.gModuleBuildTracking: - GlobalData.gModuleBuildTracking[Ma.Arch] =3D d= ict() - if Ma not in GlobalData.gModuleBuildTracking[Ma.Ar= ch]: - GlobalData.gModuleBuildTracking[Ma.Arch][Ma] = =3D 'FAIL' + GlobalData.gModuleBuildTracking[Ma] =3D 'FAIL' + mqueue =3D mp.Queue() for m in Pa.GetAllModuleInfo: mqueue.put(m) --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#45507): https://edk2.groups.io/g/devel/message/45507 Mute This Topic: https://groups.io/mt/32850699/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-