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=bob.c.feng@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 6B3FC2194EB75 for ; Tue, 2 Apr 2019 19:55:55 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Apr 2019 19:55:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,302,1549958400"; d="scan'208";a="137109398" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga008.fm.intel.com with ESMTP; 02 Apr 2019 19:55:54 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 2 Apr 2019 19:55:54 -0700 Received: from shsmsx153.ccr.corp.intel.com (10.239.6.53) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 2 Apr 2019 19:55:53 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by SHSMSX153.ccr.corp.intel.com ([169.254.12.139]) with mapi id 14.03.0415.000; Wed, 3 Apr 2019 10:55:51 +0800 From: "Feng, Bob C" To: "Gao, Liming" CC: "edk2-devel@lists.01.org" Thread-Topic: [Patch V2] BaseTools: Fixed issue in MultiThread Genfds function Thread-Index: AQHU6cNfLuQ17Se2BkyeEy40lNP3zqYpNc6AgACHMoA= Date: Wed, 3 Apr 2019 02:55:51 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D1600D1AE0@SHSMSX101.ccr.corp.intel.com> References: <20190403021702.11940-1-bob.c.feng@intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14E41D04A@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E41D04A@SHSMSX104.ccr.corp.intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch V2] BaseTools: Fixed issue in MultiThread Genfds function 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: Wed, 03 Apr 2019 02:55:55 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable If user does not use multiple thread genfds, there will be no problem.=20 -----Original Message----- From: Gao, Liming=20 Sent: Wednesday, April 3, 2019 10:49 AM To: Feng, Bob C Cc: edk2-devel@lists.01.org Subject: RE: [Patch V2] BaseTools: Fixed issue in MultiThread Genfds functi= on Bob: Thanks for your updating. If user only update BaseTools, and don't update= Conf\build_rule.txt. What problem will happen? Thanks Liming > -----Original Message----- > From: Feng, Bob C > Sent: Wednesday, April 3, 2019 10:17 AM > To: edk2-devel@lists.01.org > Cc: Feng, Bob C ; Gao, Liming=20 > > Subject: [Patch V2] BaseTools: Fixed issue in MultiThread Genfds=20 > function >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1450 > In the Multiple thread Genfds feature, build tool generates GenSec,=20 > GenFFS command in Makefile. >=20 > The Non-Hii Driver does not generate .offset file for uni string=20 > offset, but the build tool has not knowledge about this in autogen=20 > phase. So in this patch, I add a check in Makefile for GenSec command.=20 > If the GenSec input file does not exist, the GenSec will not be=20 > called. And if GenSec command is not called, its output file, which is=20 > also the input file of GenFfs command, will also not exist.So for=20 > GenFfs command, I add a new command parameter -oi which means the=20 > input file is an optional input file which would not exist. so that I=20 > can generate GenFfs command with "-oi" parameter in Makefile. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > BaseTools/Conf/build_rule.template | 8 ++++---- > BaseTools/Source/C/GenFfs/GenFfs.c | 17 +++++++++++++++-- > BaseTools/Source/Python/AutoGen/GenMake.py | 2 +- > .../Python/GenFds/GenFdsGlobalVariable.py | 10 +++++++++- > .../Source/Python/Workspace/DscBuildData.py | 3 +++ > BaseTools/Source/Python/build/build.py | 10 +++++----- > 6 files changed, 37 insertions(+), 13 deletions(-) >=20 > diff --git a/BaseTools/Conf/build_rule.template=20 > b/BaseTools/Conf/build_rule.template > index e56b1d9c59..17e7353063 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -357,15 +357,15 @@ > [Dynamic-Library-File] > > ?.dll >=20 > > - $(DEBUG_DIR)(+)$(MODULE_NAME).efi > + $(OUTPUT_DIR)(+)$(MODULE_NAME).efi >=20 > > "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) > - $(CP) ${dst} $(OUTPUT_DIR) > + $(CP) ${dst} $(DEBUG_DIR) > $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi > -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) > -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) > > $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug > @@ -376,21 +376,21 @@ > # > -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src} > -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug=20 > $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug >=20 > "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) > - $(CP) ${dst} $(OUTPUT_DIR) > + $(CP) ${dst} $(DEBUG_DIR) > $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi > -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) >=20 > > # tool to convert Mach-O to PE/COFF > "$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DE= BUG_DIR)(+)$(MODULE_NAME).pecoff > # create symbol file for GDB debug > -$(DSYMUTIL) ${src} > "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_N= AME).pecoff $(GENFW_FLAGS) > - $(CP) ${dst} $(OUTPUT_DIR) > + $(CP) ${dst} $(DEBUG_DIR) > $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi > -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR) >=20 > [Dependency-Expression-File] > > diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c=20 > b/BaseTools/Source/C/GenFfs/GenFfs.c > index 02c7ac30f0..ea36b22bef 100644 > --- a/BaseTools/Source/C/GenFfs/GenFfs.c > +++ b/BaseTools/Source/C/GenFfs/GenFfs.c > @@ -17,10 +17,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EI= THER EXPRESS OR IMPLIED. > #include > #include > #include > #endif >=20 > +#ifdef __GNUC__ > +#include > +#endif > + > #include > #include > #include >=20 > #include > @@ -158,10 +162,12 @@ Returns: > FileAlign points to file alignment, which only s= upport\n\ > the following align: 1,2,4,8,16,128,512,1K,4K,32= K,64K\n\ > 128K,256K,512K,1M,2M,4M,8M,16M\n"); > fprintf (stdout, " -i SectionFile, --sectionfile SectionFile\n\ > Section file will be contained in this FFS=20 > file.\n"); > + fprintf (stdout, " -oi SectionFile, --optionalsectionfile SectionFile= \n\ > + If the Section file exists, it will be=20 > + contained in this FFS file, otherwise, it will be ignored.\n"); > fprintf (stdout, " -n SectionAlign, --sectionalign SectionAlign\n\ > SectionAlign points to section alignment, which = support\n\ > the alignment scope 0~16M. If SectionAlign is sp= ecified\n\ > as 0, tool get alignment value from SectionFile.= It is\n\ > specified together with sectionfile to point=20 > its\n\ @@ -734,19 +740,26 @@ Returns: > argc -=3D 2; > argv +=3D 2; > continue; > } >=20 > - if ((stricmp (argv[0], "-i") =3D=3D 0) || (stricmp (argv[0], "--sect= ionfile") =3D=3D 0)) { > + if ((stricmp (argv[0], "-oi") =3D=3D 0) || (stricmp (argv[0],=20 > + "--optionalsectionfile") =3D=3D 0) || (stricmp (argv[0], "-i") =3D=3D 0= ) ||=20 > + (stricmp (argv[0], > "--sectionfile") =3D=3D 0)) { > // > // Get Input file name and its alignment > // > if (argv[1] =3D=3D NULL || argv[1][0] =3D=3D '-') { > Error (NULL, 0, 1003, "Invalid option value", "input section fil= e is missing for -i option"); > goto Finish; > } > - > + if ((stricmp (argv[0], "-oi") =3D=3D 0) || (stricmp (argv[0], "--o= ptionalsectionfile") =3D=3D 0) ){ > + if (-1 =3D=3D access(argv[1] , 0)){ > + Warning(NULL, 0, 0001, "File is not found.", argv[1]); > + argc -=3D 2; > + argv +=3D 2; > + continue; > + } > + } > // > // Allocate Input file name buffer and its alignment buffer. > // > if ((InputFileNum =3D=3D 0) && (InputFileName =3D=3D NULL)) { > InputFileName =3D (CHAR8 **) malloc (MAXIMUM_INPUT_FILE_NUM *=20 > sizeof (CHAR8 *)); diff --git=20 > a/BaseTools/Source/Python/AutoGen/GenMake.py=20 > b/BaseTools/Source/Python/AutoGen/GenMake.py > index b441817b52..2374bcf550 100644 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -714,11 +714,11 @@ cleanlib: >=20 > FfsCmdList =3D Cmd[0] > for index, Str in enumerate(FfsCmdList): > if '-o' =3D=3D Str: > OutputFile =3D FfsCmdList[index + 1] > - if '-i' =3D=3D Str: > + if '-i' =3D=3D Str or "-oi" =3D=3D Str: > if DepsFileList =3D=3D []: > DepsFileList =3D [FfsCmdList[index + 1]] > else: > DepsFileList.append(FfsCmdList[index + 1]) > DepsFileString =3D ' '.join(DepsFileList).strip() diff=20 > --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py=20 > b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > index 028bcc480c..b42829b698 100644 > --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py > @@ -33,10 +33,11 @@ from Common.ToolDefClassObject import=20 > ToolDefClassObject, ToolDefDict from AutoGen.BuildEngine import=20 > BuildRule import Common.DataType as DataType from Common.Misc import=20 > PathClass from Common.LongFilePathSupport import OpenLongFilePath as=20 > open from Common.MultipleWorkspace import MultipleWorkspace as mws > +import Common.GlobalData as GlobalData >=20 > ## Global variables > # > # > class GenFdsGlobalVariable: > @@ -499,10 +500,14 @@ class GenFdsGlobalVariable: > Cmd +=3D ("-o", Output) > Cmd +=3D Input >=20 > SaveFileOnChange(CommandFile, ' '.join(Cmd), False) > if IsMakefile: > + if GlobalData.gGlobalDefines.get("FAMILY") =3D=3D "MSFT"= : > + Cmd =3D ['if', 'exist', Input[0]] + Cmd > + else: > + Cmd =3D ['test', '-e', Input[0], "&&"] + Cmd > if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.Sec= CmdList: > GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd)= .strip()) > elif GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + = [CommandFile]): > GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s = needs update because of newer %s" % (Output, Input)) > GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to=20 > generate section") @@ -540,11 +545,14 @@ class GenFdsGlobalVariable: > Align =3D mFfsValidAlign[index + 1] > Cmd +=3D ("-a", Align) >=20 > Cmd +=3D ("-o", Output) > for I in range(0, len(Input)): > - Cmd +=3D ("-i", Input[I]) > + if MakefilePath: > + Cmd +=3D ("-oi", Input[I]) > + else: > + Cmd +=3D ("-i", Input[I]) > if SectionAlign and SectionAlign[I]: > Cmd +=3D ("-n", SectionAlign[I]) >=20 > CommandFile =3D Output + '.txt' > SaveFileOnChange(CommandFile, ' '.join(Cmd), False) diff=20 > --git a/BaseTools/Source/Python/Workspace/DscBuildData.py=20 > b/BaseTools/Source/Python/Workspace/DscBuildData.py > index 129c0c950b..ac95c7df17 100644 > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > @@ -318,10 +318,13 @@ class DscBuildData(PlatformBuildClassObject): >=20 > ## Get architecture > @property > def Arch(self): > return self._Arch > + @property > + def Dir(self): > + return self.MetaFile.Dir >=20 > ## Retrieve all information in [Defines] section > # > # (Retrieving all [Defines] information in one-shot is just to sav= e time.) > # > diff --git a/BaseTools/Source/Python/build/build.py=20 > b/BaseTools/Source/Python/build/build.py > index de641fb452..41d405e6ff 100644 > --- a/BaseTools/Source/Python/build/build.py > +++ b/BaseTools/Source/Python/build/build.py > @@ -1667,11 +1667,11 @@ class Build(): > self.Progress.Stop("done!") >=20 > # Add ffs build to makefile > CmdListDict =3D {} > if GlobalData.gEnableGenfdsMultiThread and self.Fdf: > - CmdListDict =3D self._GenFfsCmd() > + CmdListDict =3D self._GenFfsCmd(Wa.ArchList) >=20 > for Arch in Wa.ArchList: > GlobalData.gGlobalDefines['ARCH'] =3D Arch > Pa =3D PlatformAutoGen(Wa, self.PlatformFile, BuildT= arget, ToolChain, Arch) > for Module in Pa.Platform.Modules: > @@ -1760,11 +1760,11 @@ class Build(): > self.LoadFixAddress =3D Wa.Platform.LoadFixAddress > Wa.CreateMakeFile(False) > # Add ffs build to makefile > CmdListDict =3D None > if GlobalData.gEnableGenfdsMultiThread and self.Fdf: > - CmdListDict =3D self._GenFfsCmd() > + CmdListDict =3D self._GenFfsCmd(Wa.ArchList) > self.Progress.Stop("done!") > MaList =3D [] > ExitFlag =3D threading.Event() > ExitFlag.clear() > self.AutoGenTime +=3D int(round((time.time() -=20 > WorkspaceAutoGenTime))) @@ -1879,15 +1879,15 @@ class Build(): > # > # Save MAP buffer into MAP file. > # > self._SaveMapFile (MapBuffer, Wa) >=20 > - def _GenFfsCmd(self): > + def _GenFfsCmd(self,ArchList): > # convert dictionary of Cmd:(Inf,Arch) > # to a new dictionary of (Inf,Arch):Cmd,Cmd,Cmd... > CmdSetDict =3D defaultdict(set) > - GenFfsDict =3D GenFds.GenFfsMakefile('', GlobalData.gFdfParser, = self, self.ArchList, GlobalData) > + GenFfsDict =3D GenFds.GenFfsMakefile('', GlobalData.gFdfParser,= =20 > + self, ArchList, GlobalData) > for Cmd in GenFfsDict: > tmpInf, tmpArch =3D GenFfsDict[Cmd] > CmdSetDict[tmpInf, tmpArch].add(Cmd) > return CmdSetDict >=20 > @@ -1927,11 +1927,11 @@ class Build(): > Wa.CreateMakeFile(False) >=20 > # Add ffs build to makefile > CmdListDict =3D None > if GlobalData.gEnableGenfdsMultiThread and self.Fdf: > - CmdListDict =3D self._GenFfsCmd() > + CmdListDict =3D self._GenFfsCmd(Wa.ArchList) >=20 > # multi-thread exit flag > ExitFlag =3D threading.Event() > ExitFlag.clear() > self.AutoGenTime +=3D int(round((time.time() -=20 > WorkspaceAutoGenTime))) > -- > 2.20.1.windows.1