public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gao, Liming" <liming.gao@intel.com>
To: "Feng, Bob C" <bob.c.feng@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [Patch] BaseTool: Filter out unused structure pcds
Date: Wed, 24 Oct 2018 14:34:58 +0000	[thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E35C922@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20181019120009.21856-1-bob.c.feng@intel.com>

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of BobCF
> Sent: Friday, October 19, 2018 8:00 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@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.feng@intel.com>
> Cc: Liming Gao <liming.gao@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


  parent reply	other threads:[~2018-10-24 14:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-19 12:00 [Patch] BaseTool: Filter out unused structure pcds BobCF
2018-10-19 14:34 ` Carsey, Jaben
2018-10-24 14:34 ` Gao, Liming [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-11-01 14:57 BobCF
2018-11-29  0:20 ` Gao, Liming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E35C922@SHSMSX104.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox