From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7822021E256B6 for ; Thu, 25 Jan 2018 01:49:18 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jan 2018 01:54:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,411,1511856000"; d="scan'208";a="198529383" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga005.fm.intel.com with ESMTP; 25 Jan 2018 01:54:47 -0800 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 25 Jan 2018 01:54:46 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 25 Jan 2018 01:54:46 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Thu, 25 Jan 2018 17:54:44 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTool: Combine the HiiPcd value if they link to same Variable Thread-Index: AQHTk/CHfIgh1QjHrE6r8d0L3oASt6OEXSXA Date: Thu, 25 Jan 2018 09:54:44 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1AC6F0@SHSMSX104.ccr.corp.intel.com> References: <20180123021853.12684-1-bob.c.feng@intel.com> In-Reply-To: <20180123021853.12684-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTool: Combine the HiiPcd value if they link to same Variable X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jan 2018 09:49:18 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Feng, Bob C >Sent: Tuesday, January 23, 2018 10:19 AM >To: edk2-devel@lists.01.org >Cc: Feng, Bob C ; Gao, Liming >Subject: [Patch] BaseTool: Combine the HiiPcd value if they link to same >Variable > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >--- > BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +- > BaseTools/Source/Python/AutoGen/GenVar.py | 36 >++++++++++++++++++++++++++++-- > 2 files changed, 35 insertions(+), 3 deletions(-) > >diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py >b/BaseTools/Source/Python/AutoGen/AutoGen.py >index 0f7454f55a..604d38a4d6 100644 >--- a/BaseTools/Source/Python/AutoGen/AutoGen.py >+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py >@@ -1404,11 +1404,11 @@ class PlatformAutoGen(AutoGen): > continue > if len(Sku.VariableName) > 0: > VariableGuidStructure =3D Sku.VariableGuidValue > VariableGuid =3D >GuidStructureStringToGuidString(VariableGuidStructure) > for StorageName in Sku.DefaultStoreDict: >- >VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuNa >me, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableAttribute , >Sku.HiiDefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType)) >+ >VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuNa >me, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableOffset, >Sku.VariableAttribute , >Sku.HiiDefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType)) > Index +=3D 1 > return VariableInfo > > def UpdateNVStoreMaxSize(self,OrgVpdFile): > if self.VariableInfo: >diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py >b/BaseTools/Source/Python/AutoGen/GenVar.py >index 65d0bea36c..1389d7ff62 100644 >--- a/BaseTools/Source/Python/AutoGen/GenVar.py >+++ b/BaseTools/Source/Python/AutoGen/GenVar.py >@@ -19,11 +19,11 @@ import collections > import copy > from Common.VariableAttributes import VariableAttributes > from Common.Misc import * > import collections > >-var_info =3D collections.namedtuple("uefi_var", >"pcdindex,pcdname,defaultstoragename,skuname,var_name, var_guid, >var_attribute,pcd_default_value, default_value, data_type") >+var_info =3D collections.namedtuple("uefi_var", >"pcdindex,pcdname,defaultstoragename,skuname,var_name, var_guid, >var_offset,var_attribute,pcd_default_value, default_value, data_type") > NvStorageHeaderSize =3D 28 > VariableHeaderSize =3D 32 > > def StringArrayToList(StringArray): > StringArray =3D StringArray[1:-1] >@@ -74,11 +74,42 @@ class VariableMgr(object): > value_str =3D "{" > default_var_bin_strip =3D [ data.strip("""'""") for data in defau= lt_var_bin] > value_str +=3D ",".join(default_var_bin_strip) > value_str +=3D "}" > return value_str >- >+ def combine_variable(self): >+ indexedvarinfo =3D collections.OrderedDict() >+ for item in self.VarInfo: >+ if (item.skuname,item.defaultstoragename, >item.var_name,item.var_guid) not in indexedvarinfo: >+ indexedvarinfo[(item.skuname,item.defaultstoragename, >item.var_name,item.var_guid) ] =3D [] >+ indexedvarinfo[(item.skuname,item.defaultstoragename, >item.var_name,item.var_guid)].append(item) >+ for key in indexedvarinfo: >+ sku_var_info_offset_list =3D indexedvarinfo[key] >+ if len(sku_var_info_offset_list) =3D=3D 1: >+ continue >+ newvalue =3D {} >+ for item in sku_var_info_offset_list: >+ data_type =3D item.data_type >+ value_list =3D item.default_value.strip("{").strip("}").s= plit(",") >+ if data_type in ["BOOLEAN","UINT8","UINT16","UINT32","UIN= T64"]: >+ if data_type =3D=3D ["BOOLEAN","UINT8"]: >+ data_flag =3D "=3DB" >+ elif data_type =3D=3D "UINT16": >+ data_flag =3D "=3DH" >+ elif data_type =3D=3D "UINT32": >+ data_flag =3D "=3DL" >+ elif data_type =3D=3D "UINT64": >+ data_flag =3D "=3DQ" >+ data =3D value_list[0] >+ value_list =3D [] >+ for data_byte in pack(data_flag,int(data,16) if >data.upper().startswith('0X') else int(data)): >+ value_list +=3D [hex(unpack("B",data_byte)[0])] >+ newvalue[int(item.var_offset,16) if >item.var_offset.upper().startswith("0X") else int(item.var_offset)] =3D >value_list >+ newvaluestr =3D "{" + ",".join(reduce(lambda x,y: x+y, [newva= lue[k] for k >in sorted(newvalue.keys())] )) +"}" >+ n =3D sku_var_info_offset_list[0] >+ indexedvarinfo[key] =3D >[var_info(n.pcdindex,n.pcdname,n.defaultstoragename,n.skuname,n.var_na >me, n.var_guid, "0x00",n.var_attribute,newvaluestr , newvaluestr , "VOID*= ")] >+ self.VarInfo =3D [item[0] for item in indexedvarinfo.values()] > def process_variable_data(self): > > var_data =3D dict() > > indexedvarinfo =3D collections.OrderedDict() >@@ -132,10 +163,11 @@ class VariableMgr(object): > var_data[(skuid,defaultstoragename)] =3D collections.= OrderedDict() > var_data[(skuid,defaultstoragename)][index] =3D >(data_delta,sku_var_info[(skuid,defaultstoragename)]) > return var_data > > def new_process_varinfo(self): >+ self.combine_variable() > > var_data =3D self.process_variable_data() > > if not var_data: > return [] >-- >2.14.3.windows.1