public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Jaben Carsey <jaben.carsey@intel.com>
To: edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>, Yonghong Zhu <yonghong.zhu@intel.com>
Subject: [PATCH v1 12/14] BaseTools: change more list to set
Date: Thu,  5 Apr 2018 16:14:00 -0700	[thread overview]
Message-ID: <f6c5bff3f2d5fb25e7aedd1596c3ed61d951d453.1522969978.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1522969977.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1522969977.git.jaben.carsey@intel.com>

potentially accelerate "in" testing
remove uncalled function

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
---
 BaseTools/Source/Python/AutoGen/AutoGen.py     |  5 ++--
 BaseTools/Source/Python/AutoGen/BuildEngine.py | 29 ++++++--------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 42536a61535a..342cd618c605 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -4191,7 +4191,7 @@ class ModuleAutoGen(AutoGen):
                     PcdItem = PcdComments + '\n  ' + PcdItem
                 AsBuiltInfDict['patchablepcd_item'].append(PcdItem)
 
-        HiiPcds = []
+        HiiPcds = set()
         for Pcd in Pcds + VfrPcds:
             PcdComments = ''
             PcdCommentList = []
@@ -4214,8 +4214,7 @@ class ModuleAutoGen(AutoGen):
                 #
                 if (SkuId, Pcd.TokenSpaceGuidCName, Pcd.TokenCName) in HiiPcds:
                     continue
-                else:
-                    HiiPcds.append((SkuId, Pcd.TokenSpaceGuidCName, Pcd.TokenCName))
+                HiiPcds.add((SkuId, Pcd.TokenSpaceGuidCName, Pcd.TokenCName))
             if (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) in self._PcdComments:
                 PcdCommentList = self._PcdComments[Pcd.TokenSpaceGuidCName, Pcd.TokenCName][:]
             if HiiInfo:
diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py
index 0daed7da610d..1663ddd21bb0 100644
--- a/BaseTools/Source/Python/AutoGen/BuildEngine.py
+++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py
@@ -161,7 +161,7 @@ class FileBuildRule:
 
         # Check input files
         self.IsMultipleInput = False
-        self.SourceFileExtList = []
+        self.SourceFileExtList = set()
         for File in Input:
             Base, Ext = os.path.splitext(File)
             if Base.find("*") >= 0:
@@ -172,8 +172,7 @@ class FileBuildRule:
                 # There's no "*" and "?" in file name
                 self.ExtraSourceFileList.append(File)
                 continue
-            if Ext not in self.SourceFileExtList:
-                self.SourceFileExtList.append(Ext)
+            self.SourceFileExtList.add(Ext)
 
         # Check output files
         self.DestFileList = []
@@ -194,16 +193,6 @@ class FileBuildRule:
         CommandString = "\n\t".join(self.CommandList)
         return "%s : %s\n\t%s" % (DestString, SourceString, CommandString)
 
-    ## Check if given file extension is supported by this rule
-    #
-    #   @param  FileExt     The extension of a file
-    #
-    #   @retval True        If the extension is supported
-    #   @retval False       If the extension is not supported
-    #
-    def IsSupported(self, FileExt):
-        return FileExt in self.SourceFileExtList
-
     def Instantiate(self, Macros={}):
         NewRuleObject = copy.copy(self)
         NewRuleObject.BuildTargets = {}
@@ -365,8 +354,8 @@ class BuildRule:
         self._State = ""
         self._RuleInfo = tdict(True, 2)     # {toolchain family : {"InputFile": {}, "OutputFile" : [], "Command" : []}}
         self._FileType = ''
-        self._BuildTypeList = []
-        self._ArchList = []
+        self._BuildTypeList = set()
+        self._ArchList = set()
         self._FamilyList = []
         self._TotalToolChainFamilySet = set()
         self._RuleObjectList = [] # FileBuildRule object list
@@ -456,8 +445,8 @@ class BuildRule:
     #
     def ParseSectionHeader(self, LineIndex):
         self._RuleInfo = tdict(True, 2)
-        self._BuildTypeList = []
-        self._ArchList = []
+        self._BuildTypeList = set()
+        self._ArchList = set()
         self._FamilyList = []
         self._TotalToolChainFamilySet = set()
         FileType = ''
@@ -494,10 +483,8 @@ class BuildRule:
                     BuildType = TokenList[1]
                 if len(TokenList) > 2:
                     Arch = TokenList[2]
-            if BuildType not in self._BuildTypeList:
-                self._BuildTypeList.append(BuildType)
-            if Arch not in self._ArchList:
-                self._ArchList.append(Arch)
+            self._BuildTypeList.add(BuildType)
+            self._ArchList.add(Arch)
 
         if 'COMMON' in self._BuildTypeList and len(self._BuildTypeList) > 1:
             EdkLogger.error("build", FORMAT_INVALID,
-- 
2.16.2.windows.1



  parent reply	other threads:[~2018-04-05 23:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-05 23:13 [PATCH v1 00/14] BaseTools: refactoring the code for readability and simplicity Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 01/14] BaseTools: remove unused file Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 02/14] BaseTools: remove uncalled functions Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 03/14] BaseTools: defaultdict(set) allows us to just add to the set Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 04/14] BaseTools: sets are faster to check via "in" due to hashing Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 05/14] BaseTools: replace a dict with a set Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 06/14] BaseTools: remove unused variables Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 07/14] BaseTools: change list to set Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 08/14] BaseTools: simplify testing for existance and containing data Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 09/14] BaseTools: optimize buildoptions loop Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 10/14] BaseTools: change another list to set Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 11/14] BaseTools: remove unneeded function call Jaben Carsey
2018-04-05 23:14 ` Jaben Carsey [this message]
2018-04-05 23:14 ` [PATCH v1 13/14] BaseTools: GenC - move content from both parts of if/else Jaben Carsey
2018-04-05 23:14 ` [PATCH v1 14/14] BaseTools: refactor and remove out of date use of .keys() Jaben Carsey
2018-04-10  1:53 ` [PATCH v1 00/14] BaseTools: refactoring the code for readability and simplicity Zhu, Yonghong

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=f6c5bff3f2d5fb25e7aedd1596c3ed61d951d453.1522969978.git.jaben.carsey@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