scons: Move the build of ext/ into the variant dirs.
These are no longer split out and shared in the root build/ directory. This does result in a small amount of overhead from building redundant copies of these files, although the overhead is not significant. When building 7 different variants of gem5, all the ISAs and NULL, the difference on my machine was: Before: real 41m25.372s user 914m22.266s sys 41m51.816s After: real 42m38.074s user 921m36.852s sys 43m2.949s This is about a 2-3% difference, which is a worse than typical case, since the overhead scales with the number of variants being built. The benefit of pulling ext/ into the variant directory is that there can now be a single config which applies to all files used to build gem5, and that config is represented by the variant of gem5 being built. Change-Id: I6f0db97c63a7f3e252e7e351aa862340978e701b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56750 Maintainer: Gabe Black <gabe.black@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Gabe Black <gabe.black@gmail.com>
This commit is contained in:
@@ -38,16 +38,16 @@
|
||||
|
||||
import os
|
||||
|
||||
Import('main')
|
||||
Import('env')
|
||||
|
||||
# See if we got a cloned DRAMSim2 repo as a subdirectory and set the
|
||||
# HAVE_DRAMSIM flag accordingly
|
||||
if not os.path.exists(Dir('.').srcnode().abspath + '/DRAMSim2'):
|
||||
main['HAVE_DRAMSIM'] = False
|
||||
env['HAVE_DRAMSIM'] = False
|
||||
Return()
|
||||
|
||||
# We have got the folder, so add the library and build the wrappers
|
||||
main['HAVE_DRAMSIM'] = True
|
||||
env['HAVE_DRAMSIM'] = True
|
||||
|
||||
# Add the appropriate files. We leave out the trace driven simulator
|
||||
dram_files = []
|
||||
@@ -59,7 +59,7 @@ DRAMFile('AddressMapping.cpp')
|
||||
DRAMFile('Bank.cpp')
|
||||
DRAMFile('BankState.cpp')
|
||||
DRAMFile('BusPacket.cpp')
|
||||
DRAMFile('ClockDomain.cpp')
|
||||
DRAMFile('ClockDoenv.cpp')
|
||||
DRAMFile('CommandQueue.cpp')
|
||||
DRAMFile('IniReader.cpp')
|
||||
DRAMFile('MemoryController.cpp')
|
||||
@@ -71,11 +71,11 @@ DRAMFile('Transaction.cpp')
|
||||
|
||||
# DRAMSim2 violates some of the warning flags used by gem5, so
|
||||
# we explicitly disable them here
|
||||
dramenv = main.Clone()
|
||||
dramenv = env.Clone()
|
||||
dramenv.Append(CCFLAGS=['-Wno-unused-value', '-Wno-error=nonnull-compare'])
|
||||
|
||||
# If we are using clang, there are more flags to disable
|
||||
if main['CLANG']:
|
||||
if env['CLANG']:
|
||||
dramenv.Append(CCFLAGS=['-Wno-unused-private-field',
|
||||
'-Wno-tautological-undefined-compare'])
|
||||
|
||||
@@ -85,6 +85,6 @@ dramenv.Append(CCFLAGS=['-DNO_STORAGE'])
|
||||
|
||||
dramenv.Library('dramsim2', [dramenv.SharedObject(f) for f in dram_files])
|
||||
|
||||
main.Prepend(CPPPATH=Dir('.'))
|
||||
main.Append(LIBS=['dramsim2'])
|
||||
main.Prepend(LIBPATH=[Dir('.')])
|
||||
env.Prepend(CPPPATH=Dir('.'))
|
||||
env.Append(LIBS=['dramsim2'])
|
||||
env.Prepend(LIBPATH=[Dir('.')])
|
||||
|
||||
Reference in New Issue
Block a user