From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 8C4E021959CB2 for ; Fri, 29 Mar 2019 07:20:21 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Mar 2019 07:20:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,284,1549958400"; d="scan'208";a="146350382" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga002.jf.intel.com with ESMTP; 29 Mar 2019 07:20:20 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 29 Mar 2019 07:20:20 -0700 Received: from shsmsx153.ccr.corp.intel.com (10.239.6.53) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 29 Mar 2019 07:20:19 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.74]) by SHSMSX153.ccr.corp.intel.com ([169.254.12.121]) with mapi id 14.03.0415.000; Fri, 29 Mar 2019 22:20:17 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools:Enable the /MP option of MSVC compiler Thread-Index: AQHU5itDe/2xXyYkhEOhUebXOE9lBqYipk7A Date: Fri, 29 Mar 2019 14:20:17 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E40ED94@SHSMSX104.ccr.corp.intel.com> References: <20190329123007.52756-1-bob.c.feng@intel.com> In-Reply-To: <20190329123007.52756-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjFjZWZjZGMtYmIyNC00NmE0LWI2MmMtYjc5NmZiN2U2Y2Q5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoicm55Yk0rXC9XSXpKUWQ5cnNGKzAwbGJoQXpSaUlYRE1qcUNuN25CTzk2eFwvMEgra1JmOVpEYjY5SzlOczc2M2FjIn0= dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools:Enable the /MP option of MSVC compiler X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2019 14:20:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Bob: How about use /MP option without process number? The compiler will retrie= ves the number of effective processors on your computer.=20 And, move this option into CC_FLAGS in tools_def.txt. If so, platform can= override it in platform DSC file.=20 Last, please provide the performance data with this option.=20 Thanks Liming > -----Original Message----- > From: Feng, Bob C > Sent: Friday, March 29, 2019 8:30 PM > To: edk2-devel@lists.01.org > Cc: Fan, ZhijuX ; Feng, Bob C ; Gao, Liming > Subject: [Patch] BaseTools:Enable the /MP option of MSVC compiler >=20 > From: Zhiju Fan >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1672 > The /MP option of MSVC compiler can reduce the total > time to compile the source files on the command line. >=20 > This patch is going to enable this MSVC option in BaseTools. >=20 > Cc: Bob Feng > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Zhiju.Fan > --- > BaseTools/Conf/build_rule.template | 2 +- > BaseTools/Source/Python/AutoGen/GenMake.py | 81 ++++++++++++++++++++-- > 2 files changed, 75 insertions(+), 8 deletions(-) >=20 > diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_ru= le.template > index e56b1d9c59..e7d736740f 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -127,11 +127,11 @@ >=20 > > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj >=20 > > - "$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src} > + "$(CC)" /MP7 /Fo${d_path}\ $(CC_FLAGS) $(INC) ${src} >=20 > > # For RVCTCYGWIN CC_FLAGS must be first to work around pathing i= ssues > "$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src} >=20 > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Sourc= e/Python/AutoGen/GenMake.py > index b441817b52..04951346ad 100644 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -433,11 +433,11 @@ cleanlib: > self.BuildTargetList =3D [] # [target string] > self.PendingBuildTargetList =3D [] # [FileBuildRule objects] > self.CommonFileDependency =3D [] > self.FileListMacros =3D {} > self.ListFileMacros =3D {} > - > + self.ObjTargetDict =3D {} > self.FileCache =3D {} > self.LibraryBuildCommandList =3D [] > self.LibraryFileList =3D [] > self.LibraryMakefileList =3D [] > self.LibraryBuildDirectoryList =3D [] > @@ -616,10 +616,15 @@ cleanlib: > ListFileName, > "\n".join(self.ListFileMacros[ListFileMacro]), > False > ) >=20 > + # Generate objlist used to create .obj file > + for Type in self.ObjTargetDict: > + NewLine =3D ' '.join(list(self.ObjTargetDict[Type])) > + FileMacroList.append("OBJLIST_%s =3D %s" % (list(self.ObjTar= getDict.keys()).index(Type), NewLine)) > + > BcTargetList =3D [] >=20 > MakefileName =3D self._FILE_NAME_[self._FileType] > LibraryMakeCommandList =3D [] > for D in self.LibraryBuildDirectoryList: > @@ -925,17 +930,22 @@ cleanlib: > # Extract common files list in the dependency files > # > for File in DepSet: > self.CommonFileDependency.append(self.PlaceMacro(File.Path, = self.Macros)) >=20 > + CmdSumDict =3D {} > + CmdTargetDict =3D {} > + CmdCppDict =3D {} > + DependencyDict =3D FileDependencyDict.copy() > for File in FileDependencyDict: > # skip non-C files > if File.Ext not in [".c", ".C"] or File.Name =3D=3D "AutoGen= .c": > continue > NewDepSet =3D set(FileDependencyDict[File]) > NewDepSet -=3D DepSet > FileDependencyDict[File] =3D ["$(COMMON_DEPS)"] + list(NewDe= pSet) > + DependencyDict[File] =3D list(NewDepSet) >=20 > # Convert target description object to target string in makefile > for Type in self._AutoGenObject.Targets: > for T in self._AutoGenObject.Targets[Type]: > # Generate related macros if needed > @@ -943,15 +953,25 @@ cleanlib: > self.FileListMacros[T.FileListMacro] =3D [] > if T.GenListFile and T.ListFileMacro not in self.ListFil= eMacros: > self.ListFileMacros[T.ListFileMacro] =3D [] > if T.GenIncListFile and T.IncListFileMacro not in self.L= istFileMacros: > self.ListFileMacros[T.IncListFileMacro] =3D [] > + if self._AutoGenObject.BuildRuleFamily =3D=3D TAB_COMPIL= ER_MSFT and Type =3D=3D TAB_C_CODE_FILE: > + NewFile =3D self.PlaceMacro(str(T), self.Macros) > + if self.ObjTargetDict.get(T.Target.SubDir): > + self.ObjTargetDict[T.Target.SubDir].add(NewFile) > + else: > + self.ObjTargetDict[T.Target.SubDir] =3D set() > + self.ObjTargetDict[T.Target.SubDir].add(NewFile) >=20 > Deps =3D [] > + CCodeDeps =3D [] > # Add force-dependencies > for Dep in T.Dependencies: > Deps.append(self.PlaceMacro(str(Dep), self.Macros)) > + if Dep !=3D '$(MAKE_FILE)': > + CCodeDeps.append(self.PlaceMacro(str(Dep), self.= Macros)) > # Add inclusion-dependencies > if len(T.Inputs) =3D=3D 1 and T.Inputs[0] in FileDepende= ncyDict: > for F in FileDependencyDict[T.Inputs[0]]: > Deps.append(self.PlaceMacro(str(F), self.Macros)= ) > # Add source-dependencies > @@ -971,16 +991,63 @@ cleanlib: > if T.GenFileListMacro: > Deps.append("$(%s)" % T.FileListMacro) > if Type in [TAB_OBJECT_FILE, TAB_STATIC_LIBRARY]: > Deps.append("$(%s)" % T.ListFileMacro) >=20 > - TargetDict =3D { > - "target" : self.PlaceMacro(T.Target.Path, self.= Macros), > - "cmd" : "\n\t".join(T.Commands), > - "deps" : Deps > - } > - self.BuildTargetList.append(self._BUILD_TARGET_TEMPLATE.= Replace(TargetDict)) > + if self._AutoGenObject.BuildRuleFamily =3D=3D TAB_COMPIL= ER_MSFT and Type =3D=3D TAB_C_CODE_FILE: > + T, CmdTarget, CmdTargetDict, CmdCppDict =3D self.Par= serCCodeFile(T, Type, CmdSumDict, CmdTargetDict, > CmdCppDict, DependencyDict) > + TargetDict =3D {"target": self.PlaceMacro(T.Target.P= ath, self.Macros), "cmd": "\n\t".join(T.Commands),"deps": > CCodeDeps} > + CmdLine =3D self._BUILD_TARGET_TEMPLATE.Replace(Targ= etDict).rstrip().replace('\t$(OBJLIST', '$(OBJLIST') > + if T.Commands: > + CmdLine =3D '%s%s' %(CmdLine, TAB_LINE_BREAK) > + if CCodeDeps or CmdLine: > + self.BuildTargetList.append(CmdLine) > + else: > + TargetDict =3D {"target": self.PlaceMacro(T.Target.P= ath, self.Macros), "cmd": "\n\t".join(T.Commands),"deps": Deps} > + self.BuildTargetList.append(self._BUILD_TARGET_TEMPL= ATE.Replace(TargetDict)) > + > + def ParserCCodeFile(self, T, Type, CmdSumDict, CmdTargetDict, CmdCpp= Dict, DependencyDict): > + if not CmdSumDict: > + for item in self._AutoGenObject.Targets[Type]: > + CmdSumDict[item.Target.SubDir] =3D item.Target.BaseName > + for CppPath in item.Inputs: > + Path =3D self.PlaceMacro(CppPath.Path, self.Macros) > + if CmdCppDict.get(item.Target.SubDir): > + CmdCppDict[item.Target.SubDir].append(Path) > + else: > + CmdCppDict[item.Target.SubDir] =3D ['$(MAKE_FILE= )', Path] > + if CppPath.Path in DependencyDict: > + for Temp in DependencyDict[CppPath.Path]: > + Path =3D self.PlaceMacro(Temp.Path, self.Mac= ros) > + if Path not in (self.CommonFileDependency + = CmdCppDict[item.Target.SubDir]): > + CmdCppDict[item.Target.SubDir].append(Pa= th) > + if T.Commands: > + CommandList =3D T.Commands[:] > + for Item in CommandList[:]: > + SingleCommandList =3D Item.split() > + if len(SingleCommandList) > 0 and '$(CC)' in SingleComma= ndList[0]: > + for Temp in SingleCommandList: > + if Temp.startswith('/Fo'): > + CmdSign =3D '%s%s' % (Temp.rsplit(TAB_SLASH,= 1)[0], TAB_SLASH) > + break > + else: continue > + if CmdSign not in list(CmdTargetDict.keys()): > + CmdLine =3D Item.replace(Temp, CmdSign) > + if GlobalData.gOptions.ThreadNumber: > + CmdLine =3D CmdLine.replace('/MP7', '%s%d' %= ('/MP', GlobalData.gOptions.ThreadNumber)) > + CmdTargetDict[CmdSign] =3D CmdLine > + else: > + CmdTargetDict[CmdSign] =3D "%s %s" % (CmdTargetD= ict[CmdSign], SingleCommandList[-1]) > + Index =3D CommandList.index(Item) > + CommandList.pop(Index) > + if SingleCommandList[-1].endswith("%s%s.c" % (TAB_SL= ASH, CmdSumDict[CmdSign.lstrip('/Fo').rsplit(TAB_SLASH, > 1)[0]])): > + Cpplist =3D CmdCppDict[T.Target.SubDir] > + Cpplist.insert(0, '$(OBJLIST_%d): $(COMMON_DEPS)= ' % list(self.ObjTargetDict.keys()).index(T.Target.SubDir)) > + T.Commands[Index] =3D '%s\n\t%s' % (' \\\n\t'.jo= in(Cpplist), CmdTargetDict[CmdSign]) > + else: > + T.Commands.pop(Index) > + return T, CmdSumDict, CmdTargetDict, CmdCppDict >=20 > ## For creating makefile targets for dependent libraries > def ProcessDependentLibrary(self): > for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList: > if not LibraryAutoGen.IsBinaryModule: > -- > 2.20.1.windows.1