Reviewed-by: Jaben Carsey <jaben.car...@intel.com>
> -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > BobCF > Sent: Friday, October 19, 2018 5:00 AM > To: edk2-devel@lists.01.org > Cc: Gao, Liming <liming....@intel.com> > Subject: [edk2] [Patch] BaseTool: Filter out unused structure pcds > > The current code handle all the structure pcds > even if there is no module or library use them. > This patch is going to filter out the unused structure pcds. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng <bob.c.f...@intel.com> > Cc: Liming Gao <liming....@intel.com> > --- > .../Source/Python/Workspace/DscBuildData.py | 19 > +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py > b/BaseTools/Source/Python/Workspace/DscBuildData.py > index e481ea4f64..31bce16d15 100644 > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > @@ -274,10 +274,11 @@ class DscBuildData(PlatformBuildClassObject): > self._RFCLanguages = None > self._ISOLanguages = None > self._VpdToolGuid = None > self._MacroDict = None > self.DefaultStores = None > + self.UsedStructurePcd = None > > ## handle Override Path of Module > def _HandleOverridePath(self): > RecordList = self._RawData[MODEL_META_DATA_COMPONENT, > self._Arch] > for Record in RecordList: > @@ -1476,10 +1477,11 @@ class DscBuildData(PlatformBuildClassObject): > if str_pcd_obj.Type in > [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], > self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]: > str_pcd_obj_str.DefaultFromDSC = > {skuname:{defaultstore: > str_pcd_obj.SkuInfoList[skuname].DefaultStoreDict.get(defaultstore, > str_pcd_obj.SkuInfoList[skuname].HiiDefaultValue) for defaultstore in > DefaultStores} for skuname in str_pcd_obj.SkuInfoList} > else: > str_pcd_obj_str.DefaultFromDSC = > {skuname:{defaultstore: > str_pcd_obj.SkuInfoList[skuname].DefaultStoreDict.get(defaultstore, > str_pcd_obj.SkuInfoList[skuname].DefaultValue) for defaultstore in > DefaultStores} for skuname in str_pcd_obj.SkuInfoList} > S_pcd_set[Pcd] = str_pcd_obj_str > + self.FilterStrcturePcd(S_pcd_set) > if S_pcd_set: > GlobalData.gStructurePcd[self.Arch] = S_pcd_set > for stru_pcd in S_pcd_set.values(): > for skuid in SkuIds: > if skuid in stru_pcd.SkuOverrideValues: > @@ -1571,10 +1573,27 @@ class DscBuildData(PlatformBuildClassObject): > elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in > pcd.SkuInfoList: > del pcd.SkuInfoList[TAB_COMMON] > > map(self.FilterSkuSettings, [Pcds[pcdkey] for pcdkey in Pcds if > Pcds[pcdkey].Type in DynamicPcdType]) > return Pcds > + #Filter the StrucutrePcd that is not used by any module in dsc file and > fdf > file. > + def FilterStrcturePcd(self, S_pcd_set): > + if not self.UsedStructurePcd: > + FdfInfList = [] > + if GlobalData.gFdfParser: > + FdfInfList = GlobalData.gFdfParser.Profile.InfList > + FdfModuleList = [PathClass(NormPath(Inf), GlobalData.gWorkspace, > Arch=self._Arch) for Inf in FdfInfList] > + AllModulePcds = set() > + ModuleSet = set(self._Modules.keys() + self.LibraryInstances + > FdfModuleList) > + for ModuleFile in ModuleSet: > + ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, > self._Toolchain] > + AllModulePcds = AllModulePcds | set(ModuleData.Pcds.keys()) > + > + self.UsedStructurePcd = AllModulePcds > + UnusedStruPcds = set(S_pcd_set.keys()) - self.UsedStructurePcd > + for (Token, TokenSpaceGuid) in UnusedStruPcds: > + del S_pcd_set[(Token, TokenSpaceGuid)] > > ## Retrieve non-dynamic PCD settings > # > # @param Type PCD type > # > -- > 2.18.0.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
