* [PATCH 1/1] BaseTools: Move gPlatformFinalPcd to Datapipe and optimize size [not found] <cover.1650269558.git.yi1.li@intel.com> @ 2022-04-18 8:15 ` yi1 li 2022-04-21 9:19 ` Bob Feng 0 siblings, 1 reply; 2+ messages in thread From: yi1 li @ 2022-04-18 8:15 UTC (permalink / raw) To: devel; +Cc: yi1 li, Bob Feng, Liming Gao REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3828 This is a bugfix of bf9230a9f3dde065c3c8b4175ccd32e44e8f0362. 1.In the current code, gPlatformFinalPcd will save all PCDs used at whole compile process, which wastes runtime memory and is unnecessary. This patch makes gPlatformFinalPcd save only the PCDes which are assigned in the DSC file, and the PCD that has not been assigned will use the default value in DEC. 2.During the compilation process, gPlatformFinalPcd may be lost, and the current code cannot selectively assign PCD in DSC by specifying ARCH. This patch moves gPlatformFinalPcd into datapipe and modifies the assignment logicto fix this. Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Signed-off-by: yi1 li <yi1.li@intel.com> --- BaseTools/Source/Python/AutoGen/AutoGenWorker.py | 1 + BaseTools/Source/Python/AutoGen/DataPipe.py | 2 ++ BaseTools/Source/Python/Workspace/DscBuildData.py | 1 + BaseTools/Source/Python/Workspace/InfBuildData.py | 15 +++++++++------ .../Source/Python/Workspace/WorkspaceCommon.py | 5 ----- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py index eea15239d42a..0ba2339bed64 100755 --- a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py +++ b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py @@ -216,6 +216,7 @@ class AutoGenWorkerInProcess(mp.Process): GlobalData.gModuleHashFile = dict() GlobalData.gFileHashDict = dict() GlobalData.gEnableGenfdsMultiThread = self.data_pipe.Get("EnableGenfdsMultiThread") + GlobalData.gPlatformFinalPcds = self.data_pipe.Get("gPlatformFinalPcds") GlobalData.file_lock = self.file_lock CommandTarget = self.data_pipe.Get("CommandTarget") pcd_from_build_option = [] diff --git a/BaseTools/Source/Python/AutoGen/DataPipe.py b/BaseTools/Source/Python/AutoGen/DataPipe.py index 41af343f6251..848c7a82963e 100755 --- a/BaseTools/Source/Python/AutoGen/DataPipe.py +++ b/BaseTools/Source/Python/AutoGen/DataPipe.py @@ -169,3 +169,5 @@ class MemoryDataPipe(DataPipe): self.DataContainer = {"BinCacheDest":GlobalData.gBinCacheDest} self.DataContainer = {"EnableGenfdsMultiThread":GlobalData.gEnableGenfdsMultiThread} + + self.DataContainer = {"gPlatformFinalPcds":GlobalData.gPlatformFinalPcds} diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index fc1e773417de..a9fdc5cafa06 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -976,6 +976,7 @@ class DscBuildData(PlatformBuildClassObject): if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds: if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] != ValueList[Index]: GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] = ValueList[Index] + GlobalData.gPlatformFinalPcds[TokenSpaceGuid + '.' + PcdCName] = ValueList[Index] return ValueList def _FilterPcdBySkuUsage(self, Pcds): diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py index cd23065b0c8e..5b9b3d7b4f01 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -1054,17 +1054,20 @@ class InfBuildData(ModuleBuildClassObject): return True return False def CheckFeatureFlagPcd(self,Instance): - Pcds = {} - if GlobalData.gPlatformFinalPcds.get(self.Arch): - Pcds = GlobalData.gPlatformFinalPcds[self.Arch].copy() + Pcds = GlobalData.gPlatformFinalPcds.copy() if PcdPattern.search(Instance): PcdTuple = tuple(Instance.split('.')[::-1]) if PcdTuple in self.Pcds: - if not (self.Pcds[PcdTuple].Type == 'FeatureFlag' or self.Pcds[PcdTuple].Type == 'FixedAtBuild') and Instance not in Pcds: + if not (self.Pcds[PcdTuple].Type == 'FeatureFlag' or self.Pcds[PcdTuple].Type == 'FixedAtBuild'): EdkLogger.error('build', FORMAT_INVALID, - "\nit must be defined in a [PcdsFeatureFlag] or [PcdsFixedAtBuild] section of Dsc or Dec file or [FeaturePcd] or [FixedPcd] of Inf file", + "\nFeatureFlagPcd must be defined in a [PcdsFeatureFlag] or [PcdsFixedAtBuild] section of Dsc or Dec file", File=str(self), ExtraData=Instance) - Pcds[Instance] = self.Pcds[PcdTuple].DefaultValue + if not Instance in Pcds: + Pcds[Instance] = self.Pcds[PcdTuple].DefaultValue + else: #if PcdTuple not in self.Pcds: + EdkLogger.error('build', FORMAT_INVALID, + "\nFeatureFlagPcd must be defined in [FeaturePcd] or [FixedPcd] of Inf file", + File=str(self), ExtraData=Instance) if Instance in Pcds: if Pcds[Instance] == '0': return False diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py index 6564a34ba724..53027a0e30f5 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -75,11 +75,6 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, additionalP break if (PcdCName, PcdTokenName) not in DecPcds: DecPcds[PcdCName, PcdTokenName] = Pkg.Pcds[Pcd] - if not GlobalData.gPlatformFinalPcds.get(Arch): - GlobalData.gPlatformFinalPcds[Arch] = OrderedDict() - for Name,Guid in DecPcds: - if DecPcds[Name,Guid].Type == 'FeatureFlag' or DecPcds[Name, Guid].Type == 'FixedAtBuild': - GlobalData.gPlatformFinalPcds[Arch]['%s.%s'%(Guid, Name)]=DecPcds[Name, Guid].DefaultValue return DecPcds, GuidDict ## Get all dependent libraries for a module -- 2.33.0.windows.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] BaseTools: Move gPlatformFinalPcd to Datapipe and optimize size 2022-04-18 8:15 ` [PATCH 1/1] BaseTools: Move gPlatformFinalPcd to Datapipe and optimize size yi1 li @ 2022-04-21 9:19 ` Bob Feng 0 siblings, 0 replies; 2+ messages in thread From: Bob Feng @ 2022-04-21 9:19 UTC (permalink / raw) To: Li, Yi1, devel@edk2.groups.io; +Cc: Gao, Liming Patch looks good. Reviewed-by: Bob Feng <bob.c.feng@intel.com> -----Original Message----- From: Li, Yi1 <yi1.li@intel.com> Sent: Monday, April 18, 2022 4:15 PM To: devel@edk2.groups.io Cc: Li, Yi1 <yi1.li@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn> Subject: [PATCH 1/1] BaseTools: Move gPlatformFinalPcd to Datapipe and optimize size REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3828 This is a bugfix of bf9230a9f3dde065c3c8b4175ccd32e44e8f0362. 1.In the current code, gPlatformFinalPcd will save all PCDs used at whole compile process, which wastes runtime memory and is unnecessary. This patch makes gPlatformFinalPcd save only the PCDes which are assigned in the DSC file, and the PCD that has not been assigned will use the default value in DEC. 2.During the compilation process, gPlatformFinalPcd may be lost, and the current code cannot selectively assign PCD in DSC by specifying ARCH. This patch moves gPlatformFinalPcd into datapipe and modifies the assignment logicto fix this. Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Signed-off-by: yi1 li <yi1.li@intel.com> --- BaseTools/Source/Python/AutoGen/AutoGenWorker.py | 1 + BaseTools/Source/Python/AutoGen/DataPipe.py | 2 ++ BaseTools/Source/Python/Workspace/DscBuildData.py | 1 + BaseTools/Source/Python/Workspace/InfBuildData.py | 15 +++++++++------ .../Source/Python/Workspace/WorkspaceCommon.py | 5 ----- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py index eea15239d42a..0ba2339bed64 100755 --- a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py +++ b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py @@ -216,6 +216,7 @@ class AutoGenWorkerInProcess(mp.Process): GlobalData.gModuleHashFile = dict() GlobalData.gFileHashDict = dict() GlobalData.gEnableGenfdsMultiThread = self.data_pipe.Get("EnableGenfdsMultiThread") + GlobalData.gPlatformFinalPcds = + self.data_pipe.Get("gPlatformFinalPcds") GlobalData.file_lock = self.file_lock CommandTarget = self.data_pipe.Get("CommandTarget") pcd_from_build_option = [] diff --git a/BaseTools/Source/Python/AutoGen/DataPipe.py b/BaseTools/Source/Python/AutoGen/DataPipe.py index 41af343f6251..848c7a82963e 100755 --- a/BaseTools/Source/Python/AutoGen/DataPipe.py +++ b/BaseTools/Source/Python/AutoGen/DataPipe.py @@ -169,3 +169,5 @@ class MemoryDataPipe(DataPipe): self.DataContainer = {"BinCacheDest":GlobalData.gBinCacheDest} self.DataContainer = {"EnableGenfdsMultiThread":GlobalData.gEnableGenfdsMultiThread} + + self.DataContainer = + {"gPlatformFinalPcds":GlobalData.gPlatformFinalPcds} diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index fc1e773417de..a9fdc5cafa06 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -976,6 +976,7 @@ class DscBuildData(PlatformBuildClassObject): if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds: if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] != ValueList[Index]: GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] = ValueList[Index] + GlobalData.gPlatformFinalPcds[TokenSpaceGuid + '.' + + PcdCName] = ValueList[Index] return ValueList def _FilterPcdBySkuUsage(self, Pcds): diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py index cd23065b0c8e..5b9b3d7b4f01 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -1054,17 +1054,20 @@ class InfBuildData(ModuleBuildClassObject): return True return False def CheckFeatureFlagPcd(self,Instance): - Pcds = {} - if GlobalData.gPlatformFinalPcds.get(self.Arch): - Pcds = GlobalData.gPlatformFinalPcds[self.Arch].copy() + Pcds = GlobalData.gPlatformFinalPcds.copy() if PcdPattern.search(Instance): PcdTuple = tuple(Instance.split('.')[::-1]) if PcdTuple in self.Pcds: - if not (self.Pcds[PcdTuple].Type == 'FeatureFlag' or self.Pcds[PcdTuple].Type == 'FixedAtBuild') and Instance not in Pcds: + if not (self.Pcds[PcdTuple].Type == 'FeatureFlag' or self.Pcds[PcdTuple].Type == 'FixedAtBuild'): EdkLogger.error('build', FORMAT_INVALID, - "\nit must be defined in a [PcdsFeatureFlag] or [PcdsFixedAtBuild] section of Dsc or Dec file or [FeaturePcd] or [FixedPcd] of Inf file", + "\nFeatureFlagPcd must be defined + in a [PcdsFeatureFlag] or [PcdsFixedAtBuild] section of Dsc or Dec + file", File=str(self), ExtraData=Instance) - Pcds[Instance] = self.Pcds[PcdTuple].DefaultValue + if not Instance in Pcds: + Pcds[Instance] = self.Pcds[PcdTuple].DefaultValue + else: #if PcdTuple not in self.Pcds: + EdkLogger.error('build', FORMAT_INVALID, + "\nFeatureFlagPcd must be defined in [FeaturePcd] or [FixedPcd] of Inf file", + File=str(self), ExtraData=Instance) if Instance in Pcds: if Pcds[Instance] == '0': return False diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py index 6564a34ba724..53027a0e30f5 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -75,11 +75,6 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, additionalP break if (PcdCName, PcdTokenName) not in DecPcds: DecPcds[PcdCName, PcdTokenName] = Pkg.Pcds[Pcd] - if not GlobalData.gPlatformFinalPcds.get(Arch): - GlobalData.gPlatformFinalPcds[Arch] = OrderedDict() - for Name,Guid in DecPcds: - if DecPcds[Name,Guid].Type == 'FeatureFlag' or DecPcds[Name, Guid].Type == 'FixedAtBuild': - GlobalData.gPlatformFinalPcds[Arch]['%s.%s'%(Guid, Name)]=DecPcds[Name, Guid].DefaultValue return DecPcds, GuidDict ## Get all dependent libraries for a module -- 2.33.0.windows.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-21 9:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1650269558.git.yi1.li@intel.com>
2022-04-18 8:15 ` [PATCH 1/1] BaseTools: Move gPlatformFinalPcd to Datapipe and optimize size yi1 li
2022-04-21 9:19 ` Bob Feng
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox