BaseTools: PcdDataBase Optimization for multiple SkuIds

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / AutoGen.py

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 783305c7ccb6d29c29cc499f651449e543416b40..5d6cce0dbb535a20050ee7c93d048fff7676f1b6 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -44,7 +44,7 @@ from Common.MultipleWorkspace import MultipleWorkspace as mws
 import InfSectionParser\r
 import datetime\r
 import hashlib\r
-from GenVar import Variable,var_info\r
+from GenVar import VariableMgr,var_info\r
 \r
 ## Regular expression for splitting Dependency Expression string into tokens\r
 gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)")\r
@@ -1225,6 +1225,7 @@ class PlatformAutoGen(AutoGen):
         self.AllPcdList = []\r
         # get the original module/package/platform objects\r
         self.BuildDatabase = Workspace.BuildDatabase\r
+        self.DscBuildDataObj = Workspace.Platform\r
 \r
         # flag indicating if the makefile/C-code file has been created or not\r
         self.IsMakeFileCreated  = False\r
@@ -1354,23 +1355,21 @@ class PlatformAutoGen(AutoGen):
                     LibAuto.ConstPcd[key] = Pcd.DefaultValue\r
 \r
     def CollectVariables(self, DynamicPcdSet):\r
-        VariableInfo = Variable()\r
+        VariableInfo = VariableMgr(self.DscBuildDataObj._GetDefaultStores(),self.DscBuildDataObj._GetSkuIds())\r
         Index = 0\r
         for Pcd in DynamicPcdSet:\r
-            if not hasattr(Pcd,"DefaultStoreName"):\r
-                Pcd.DefaultStoreName = ['0']\r
-            for StorageName in Pcd.DefaultStoreName:\r
-                pcdname = ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName))\r
-                for SkuName in Pcd.SkuInfoList:\r
-                    Sku = Pcd.SkuInfoList[SkuName]\r
-                    SkuId = Sku.SkuId\r
-                    if SkuId == None or SkuId == '':\r
-                        continue\r
-                    if len(Sku.VariableName) > 0:\r
-                        VariableGuidStructure = Sku.VariableGuidValue\r
-                        VariableGuid = GuidStructureStringToGuidString(VariableGuidStructure)\r
-                        if Pcd.Phase == "DXE":\r
-                            VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuId, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableAttribute , Pcd.DefaultValue,Sku.HiiDefaultValue,Pcd.DatumType))\r
+            pcdname = ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName))\r
+            for SkuName in Pcd.SkuInfoList:\r
+                Sku = Pcd.SkuInfoList[SkuName]\r
+                SkuId = Sku.SkuId\r
+                if SkuId == None or SkuId == '':\r
+                    continue\r
+                if len(Sku.VariableName) > 0:\r
+                    VariableGuidStructure = Sku.VariableGuidValue\r
+                    VariableGuid = GuidStructureStringToGuidString(VariableGuidStructure)\r
+                    if Pcd.Phase == "DXE":\r
+                        for StorageName in Sku.DefaultStoreDict:\r
+                            VariableInfo.append_variable(var_info(Index,pcdname,StorageName,SkuName, StringToArray(Sku.VariableName),VariableGuid, Sku.VariableAttribute , Pcd.DefaultValue,Sku.DefaultStoreDict[StorageName],Pcd.DatumType))\r
             Index += 1\r
         return VariableInfo\r
     ## Collect dynamic PCDs\r
@@ -1608,11 +1607,14 @@ class PlatformAutoGen(AutoGen):
             if PcdNvStoreDfBuffer:\r
                 var_info = self.CollectVariables(self._DynamicPcdList)\r
                 default_skuobj = PcdNvStoreDfBuffer.SkuInfoList.get("DEFAULT")\r
-                default_skuobj.DefaultValue = var_info.dump()\r
+                vardump = var_info.dump()\r
+                if vardump:\r
+                    default_skuobj.DefaultValue = vardump\r
+                    PcdNvStoreDfBuffer.DefaultValue = vardump\r
                 if default_skuobj:\r
                     PcdNvStoreDfBuffer.SkuInfoList.clear()\r
                     PcdNvStoreDfBuffer.SkuInfoList['DEFAULT'] = default_skuobj\r
-                    PcdNvStoreDfBuffer.MaxDatumSize = len(default_skuobj.DefaultValue.split(","))\r
+                    PcdNvStoreDfBuffer.MaxDatumSize = str(len(default_skuobj.DefaultValue.split(",")))\r
 \r
             PlatformPcds = self._PlatformPcds.keys()\r
             PlatformPcds.sort()\r
@@ -1790,6 +1792,13 @@ class PlatformAutoGen(AutoGen):
         self._DynamicPcdList.extend(UnicodePcdArray)\r
         self._DynamicPcdList.extend(HiiPcdArray)\r
         self._DynamicPcdList.extend(OtherPcdArray)\r
+        allskuset = [(SkuName,Sku.SkuId) for pcd in self._DynamicPcdList for (SkuName,Sku) in pcd.SkuInfoList.items()]\r
+        for pcd in self._DynamicPcdList:\r
+            if len(pcd.SkuInfoList) == 1:\r
+                for (SkuName,SkuId) in allskuset:\r
+                    if type(SkuId) in (str,unicode) and eval(SkuId) == 0 or SkuId == 0:\r
+                        continue\r
+                    pcd.SkuInfoList[SkuName] = pcd.SkuInfoList['DEFAULT']\r
         self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList\r
         \r
     ## Return the platform build data object\r
@@ -2383,7 +2392,7 @@ class PlatformAutoGen(AutoGen):
             else:\r
                 SkuName = 'DEFAULT'\r
             ToPcd.SkuInfoList = {\r
-                SkuName : SkuInfoClass(SkuName, self.Platform.SkuIds[SkuName], '', '', '', '', '', ToPcd.DefaultValue)\r
+                SkuName : SkuInfoClass(SkuName, self.Platform.SkuIds[SkuName][0], '', '', '', '', '', ToPcd.DefaultValue)\r
             }\r
 \r
     ## Apply PCD setting defined platform to a module\r