Re: [edk2-devel] [PATCH] BaseTools: Remove Duplicate sets of SkuName and SkuId from allskuset

["Michael D Kinney" <michael.d.kinney@intel.com>]

Hi Christine,

I will merge this change into edk2/BaseTools.

We need to work in why the edk2-basetools CI is not working and fix that
And get the set of BaseTools changes completed in edk2-basetools before
the edk2-stable202402 release is completed, so edk2/BaseTools and
edk2-basetools is aligned for that release and can stay aligned until
edk2/BaseTools can be retired.

Mike



> -----Original Message-----
> From: Chen, Christine <yuwei.chen@intel.com>
> Sent: Wednesday, February 7, 2024 10:39 PM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; S, Ashraf Ali
> <ashraf.ali.s@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Chan, Amy
> <amy.chan@intel.com>; devel@edk2.groups.io
> Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>
> Subject: RE: [PATCH] BaseTools: Remove Duplicate sets of SkuName and
> SkuId from allskuset
> 
> Hi Mike,
> 
> We checked the PR Gate -Ubuntu / Windows log, and seems the error is
> not raised by patch itself. In order to prove it, we submit a new PR
> with exactly no changes(only and empty lines), and the tests are still
> failure: https://github.com/tianocore/edk2-basetools/pull/114
> 
> Could you help confirm that?
> If it is not the code issue, can we merge the code directly or fix the
> pipeline issue first?
> 
> Thanks,
> Christine
> 
> > -----Original Message-----
> > From: Kinney, Michael D <michael.d.kinney@intel.com>
> > Sent: Thursday, February 8, 2024 1:54 PM
> > To: S, Ashraf Ali <ashraf.ali.s@intel.com>; Feng, Bob C
> > <bob.c.feng@intel.com>; Chan, Amy <amy.chan@intel.com>; Chen,
> Christine
> > <yuwei.chen@intel.com>; devel@edk2.groups.io
> > Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
> > <gaoliming@byosoft.com.cn>; Chaganty, Rangasai V
> > <rangasai.v.chaganty@intel.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>
> > Subject: RE: [PATCH] BaseTools: Remove Duplicate sets of SkuName and
> SkuId
> > from allskuset
> >
> > I will merge it soon.
> >
> > Please work with Christine to get edk2-basetools CI working
> correctly.
> >
> > Mike
> >
> > > -----Original Message-----
> > > From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> > > Sent: Wednesday, February 7, 2024 9:50 PM
> > > To: Feng, Bob C <bob.c.feng@intel.com>; Chan, Amy
> > > <amy.chan@intel.com>; Chen, Christine <yuwei.chen@intel.com>;
> > > devel@edk2.groups.io
> > > Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
> > > <gaoliming@byosoft.com.cn>; Chaganty, Rangasai V
> > > <rangasai.v.chaganty@intel.com>; Kinney, Michael D
> > > <michael.d.kinney@intel.com>
> > > Subject: RE: [PATCH] BaseTools: Remove Duplicate sets of SkuName
> and
> > > SkuId from allskuset
> > >
> > > Hi
> > >
> > > Is this patch merged!
> > > PR under base-tools repo : https://github.com/tianocore/edk2-
> > > basetools/pull/112
> > >
> > > Builds are failing, looks like it's not due to these changes.
> > >
> > > Thanks.,
> > > S, Ashraf Ali
> > >
> > > -----Original Message-----
> > > From: Feng, Bob C <bob.c.feng@intel.com>
> > > Sent: Tuesday, January 30, 2024 1:19 PM
> > > To: Chan, Amy <amy.chan@intel.com>; Chen, Christine
> > > <yuwei.chen@intel.com>; S, Ashraf Ali <ashraf.ali.s@intel.com>;
> > > devel@edk2.groups.io
> > > Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
> > > <gaoliming@byosoft.com.cn>; Chaganty, Rangasai V
> > > <rangasai.v.chaganty@intel.com>
> > > Subject: RE: [PATCH] BaseTools: Remove Duplicate sets of SkuName
> and
> > > SkuId from allskuset
> > >
> > > Reviewed-by: Bob Feng <bob.c.feng@intel.com>
> > >
> > > -----Original Message-----
> > > From: Chan, Amy <amy.chan@intel.com>
> > > Sent: Monday, January 8, 2024 11:54 AM
> > > To: Chen, Christine <yuwei.chen@intel.com>; S, Ashraf Ali
> > > <ashraf.ali.s@intel.com>; devel@edk2.groups.io
> > > Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
> > > <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>;
> > > Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> > > Subject: RE: [PATCH] BaseTools: Remove Duplicate sets of SkuName
> and
> > > SkuId from allskuset
> > >
> > > Reviewed-by: Amy Chan <amy.chan@intel.com>
> > >
> > > > -----Original Message-----
> > > > From: Chen, Christine <yuwei.chen@intel.com>
> > > > Sent: Monday, January 8, 2024 8:29 AM
> > > > To: S, Ashraf Ali <ashraf.ali.s@intel.com>; devel@edk2.groups.io
> > > > Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
> > > > <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>;
> > > > Chan, Amy <amy.chan@intel.com>; Chaganty, Rangasai V
> > > > <rangasai.v.chaganty@intel.com>
> > > > Subject: RE: [PATCH] BaseTools: Remove Duplicate sets of SkuName
> and
> > > > SkuId from allskuset
> > > >
> > > > Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
> > > >
> > > > > -----Original Message-----
> > > > > From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> > > > > Sent: Monday, December 25, 2023 11:28 PM
> > > > > To: devel@edk2.groups.io
> > > > > Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Chen, Christine
> > > > > <yuwei.chen@intel.com>; Rebecca Cran <rebecca@bsdio.com>; Gao,
> > > > Liming
> > > > > <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>;
> > > > > Chan, Amy <amy.chan@intel.com>; Chaganty, Rangasai V
> > > > > <rangasai.v.chaganty@intel.com>
> > > > > Subject: [PATCH] BaseTools: Remove Duplicate sets of SkuName
> and
> > > > > SkuId from allskuset
> > > > >
> > > > > Currently when the platform has many SKUs then allskuset will
> be
> > > > > having so many duplicate. and while parsing the allskuset will
> > > > > take longer time while assing Pcd.SkuInfoList.
> > > > > This patch is to eliminate those duplicate entires to reduce
> the
> > > > > build time
> > > > >
> > > > > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > > > > Cc: Rebecca Cran <rebecca@bsdio.com>
> > > > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > > > Cc: Bob Feng <bob.c.feng@intel.com>
> > > > > Cc: Amy Chan <amy.chan@intel.com>
> > > > > Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> > > > > Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
> > > > > ---
> > > > >  BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 2 ++
> > > > >  1 file changed, 2 insertions(+)
> > > > >
> > > > > diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > > > b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > > > index 592d4824a4..dac81454a9 100644
> > > > > --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > > > +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > > > @@ -707,6 +707,8 @@ class PlatformAutoGen(AutoGen):
> > > > >          self._DynamicPcdList.extend(list(OtherPcdArray))
> > > > >          self._DynamicPcdList.sort()
> > > > >          allskuset = [(SkuName, Sku.SkuId) for pcd in
> > > > > self._DynamicPcdList for (SkuName, Sku) in
> > > > > pcd.SkuInfoList.items()]
> > > > > +        # Remove duplicate sets in the list
> > > > > +        allskuset = list(set(allskuset))
> > > > >          for pcd in self._DynamicPcdList:
> > > > >              if len(pcd.SkuInfoList) == 1:
> > > > >                  for (SkuName, SkuId) in allskuset:
> > > > > --
> > > > > 2.39.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115268): https://edk2.groups.io/g/devel/message/115268
Mute This Topic: https://groups.io/mt/103360241/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-