[edk2-devel] [PATCH 1/1] BaseTools: Enable GNU make parallel jobs by default
Abner Chang
abner.chang at hpe.com
Wed Jan 19 15:03:01 UTC 2022
Hi Steven,
I don't have opinions with enabling GNU parallel job, that is fine if it does break the build.
However I am not the maintainer of BaseTools, thus I can't give the review tag to this change.
Regards,
Abner
> -----Original Message-----
> From: Shi, Steven <steven.shi at intel.com>
> Sent: Wednesday, January 19, 2022 6:52 PM
> To: ardb at kernel.org; leif at nuviainc.com; Chang, Abner (HPS SW/FW
> Technologist) <abner.chang at hpe.com>; Schaefer, Daniel (ROM Janitor)
> <daniel.schaefer at hpe.com>
> Cc: Feng, Bob C <bob.c.feng at intel.com>; Chen, Christine
> <yuwei.chen at intel.com>; devel at edk2.groups.io
> Subject: RE: [edk2-devel] [PATCH 1/1] BaseTools: Enable GNU make parallel
> jobs by default
>
> Hello Ard, Leif, Abner, Daniel,
> Are you ok to enable the GNU make "--jobs" option in GCC5 toolchain by
> default?
>
> Thanks
> Steven Shi
>
> > -----Original Message-----
> > From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of
> Steven
> > Shi
> > Sent: Monday, January 17, 2022 10:54 PM
> > To: ardb at kernel.org; leif at nuviainc.com; Chang, Abner
> > <abner.chang at hpe.com>; Schaefer, Daniel <daniel.schaefer at hpe.com>
> > Cc: Feng, Bob C <bob.c.feng at intel.com>; Chen, Christine
> > <yuwei.chen at intel.com>; devel at edk2.groups.io
> > Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: Enable GNU make
> parallel
> > jobs by default
> >
> > Hello Ard, Leif, Abner, Daniel,
> > I changed the GNU make flag to enable the "--jobs" option in GCC5
> toolchain
> > by default for all architectures. Please verify whether this change has
> impact
> > to the ARM and RISCV GCC5 builds. Thanks!
> >
> >
> > Thanks
> > Steven Shi
> >
> > > -----Original Message-----
> > > From: Shi, Steven <steven.shi at intel.com>
> > > Sent: Monday, January 17, 2022 10:43 PM
> > > To: devel at edk2.groups.io
> > > Cc: Feng, Bob C <bob.c.feng at intel.com>; Chen, Christine
> > > <yuwei.chen at intel.com>; ardb at kernel.org; leif at nuviainc.com; Chang,
> > > Abner <abner.chang at hpe.com>; Schaefer, Daniel
> > > <daniel.schaefer at hpe.com>; Shi, Steven <steven.shi at intel.com>
> > > Subject: [PATCH 1/1] BaseTools: Enable GNU make parallel jobs by
> default
> > >
> > > BZ:
> INVALID URI REMOVED
> d=3807__;!!NpxR!2rhlQ-
> hgxbtBujz5kn_RG5uJtBl209CFwFmXOlkS0vqky5LS5Yj8zwGnfwSahMs$
> > >
> > > * Enable GNU make parallel jobs support(--jobs flag) by
> > > default in GCC5 and CLANGPDB toolchains. This gmake flag
> > > can save full features bios linux build time by +20%.
> > > * Explictly distinguish and define the MS nmake flag and
> > > GNU gmake flag in the toolchain which might support
> > > both, e.g. CLANGPDB can use nmake in Windows and gmake
> > > in Linux. General make flags cannot work for such hybrid
> > > make usage scenario.
> > >
> > > Signed-off-by: Steven Shi <steven.shi at intel.com>
> > > ---
> > > BaseTools/Conf/tools_def.template | 4 ++++
> > > BaseTools/Source/Python/AutoGen/GenMake.py | 5 +++--
> > > BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 12
> > > +++++++++++-
> > > 3 files changed, 18 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/BaseTools/Conf/tools_def.template
> > > b/BaseTools/Conf/tools_def.template
> > > index 2e6b382ab623..84af08cca6ae 100755
> > > --- a/BaseTools/Conf/tools_def.template
> > > +++ b/BaseTools/Conf/tools_def.template
> > > @@ -2283,6 +2283,8 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS =
> -
> > z
> > > common-page-size=0x20
> > > *_GCC5_*_*_FAMILY = GCC
> > >
> > >
> > >
> > > *_GCC5_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make
> > >
> > > +*_GCC5_*_GMAKE_FLAGS = --jobs
> > >
> > > +*_GCC5_*_NMAKE_FLAGS = /nologo
> > >
> > > *_GCC5_*_*_DLL = ENV(GCC5_DLL)
> > >
> > > *_GCC5_*_ASL_PATH = DEF(UNIX_IASL_BIN)
> > >
> > >
> > >
> > > @@ -2742,6 +2744,8 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS =
> > > DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
> > > *_CLANGPDB_*_*_FAMILY = GCC
> > >
> > > *_CLANGPDB_*_*_BUILDRULEFAMILY = CLANGPDB
> > >
> > > *_CLANGPDB_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make
> > >
> > > +*_CLANGPDB_*_GMAKE_FLAGS = --jobs
> > >
> > > +*_CLANGPDB_*_NMAKE_FLAGS = /nologo
> > >
> > > *_CLANGPDB_*_*_DLL = ENV(CLANGPDB_DLL)
> > >
> > > *_CLANGPDB_*_ASL_PATH = DEF(UNIX_IASL_BIN)
> > >
> > >
> > >
> > > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py
> > > b/BaseTools/Source/Python/AutoGen/GenMake.py
> > > index e55efff059f9..c6636d99fc7d 100755
> > > --- a/BaseTools/Source/Python/AutoGen/GenMake.py
> > > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py
> > > @@ -732,10 +732,11 @@ cleanlib:
> > > Src, Dst = CopyCmd
> > >
> > > Src = self.ReplaceMacro(Src)
> > >
> > > Dst = self.ReplaceMacro(Dst)
> > >
> > > + Efi = Src[:-3] + 'efi'
> > >
> > > if Dst not in self.ResultFileList:
> > >
> > > self.ResultFileList.append(Dst)
> > >
> > > if '%s :' %(Dst) not in self.BuildTargetList:
> > >
> > > - self.BuildTargetList.append("%s : %s" %(Dst,Src))
> > >
> > > + self.BuildTargetList.append("%s : %s" %(Dst, Efi))
> > >
> > > self.BuildTargetList.append('\t' +
> > > self._CP_TEMPLATE_[self._Platform] %{'Src': Src, 'Dst': Dst})
> > >
> > >
> > >
> > > FfsCmdList = Cmd[0]
> > >
> > > @@ -778,7 +779,7 @@ cleanlib:
> > > SecDepsFileList.append(SecCmdList[index + 1])
> > >
> > > index = index + 1
> > >
> > > if CmdName == 'Trim':
> > >
> > > - SecDepsFileList.append(os.path.join('$(DEBUG_DIR)',
> > > os.path.basename(OutputFile).replace('offset', 'efi')))
> > >
> > > + SecDepsFileList.append(os.path.join('$(OUTPUT_DIR)',
> > > os.path.basename(OutputFile).replace('offset', 'efi')))
> > >
> > > if OutputFile.endswith('.ui') or OutputFile.endswith('.ver'):
> > >
> > > SecDepsFileList.append(os.path.join('$(MODULE_DIR)',
> > > '$(MODULE_FILE)'))
> > >
> > > self.FfsOutputFileList.append((OutputFile, '
> > > '.join(SecDepsFileList), SecCmdStr))
> > >
> > > diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > index 592d4824a4b3..632c960c8d3d 100644
> > > --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> > > @@ -893,7 +893,17 @@ class PlatformAutoGen(AutoGen):
> > > RetVal[Tool] = OrderedDict()
> > >
> > > if Attr not in RetVal[Tool]:
> > >
> > > RetVal[Tool][Attr] = Value
> > >
> > > -
> > >
> > > + if 'NMAKE' in RetVal.keys() or 'GMAKE' in RetVal.keys():
> > >
> > > + if RetVal['MAKE']['PATH'] == "nmake":
> > >
> > > + if 'FLAGS' in RetVal['MAKE'].keys():
> > >
> > > + RetVal['MAKE']['FLAGS'] += ' ' + RetVal['NMAKE']['FLAGS']
> > >
> > > + else:
> > >
> > > + RetVal['MAKE']['FLAGS'] = RetVal['NMAKE']['FLAGS']
> > >
> > > + else:
> > >
> > > + if 'FLAGS' in RetVal['MAKE'].keys():
> > >
> > > + RetVal['MAKE']['FLAGS'] += ' ' + RetVal['GMAKE']['FLAGS']
> > >
> > > + else:
> > >
> > > + RetVal['MAKE']['FLAGS'] = RetVal['GMAKE']['FLAGS']
> > >
> > > ToolsDef = ''
> > >
> > > if GlobalData.gOptions.SilentMode and "MAKE" in RetVal:
> > >
> > > if "FLAGS" not in RetVal["MAKE"]:
> > >
> > > --
> > > 2.22.0.windows.1
> >
> >
> >
> >
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85820): https://edk2.groups.io/g/devel/message/85820
Mute This Topic: https://groups.io/mt/88484954/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list