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,32 +38,32 @@
|
||||
|
||||
import os
|
||||
|
||||
Import('main')
|
||||
Import('env')
|
||||
|
||||
thermal = False
|
||||
|
||||
# See if we got a cloned DRAMSim3 repo as a subdirectory and set the
|
||||
# HAVE_DRAMSIM flag accordingly
|
||||
if not os.path.exists(Dir('.').srcnode().abspath + '/DRAMsim3'):
|
||||
main['HAVE_DRAMSIM3'] = False
|
||||
env['HAVE_DRAMSIM3'] = False
|
||||
Return()
|
||||
|
||||
# We have got the folder, so add the library and build the wrappers
|
||||
main['HAVE_DRAMSIM3'] = True
|
||||
env['HAVE_DRAMSIM3'] = True
|
||||
|
||||
|
||||
dramsim_path = os.path.join(Dir('#').abspath, 'ext/dramsim3/DRAMsim3/')
|
||||
|
||||
if thermal:
|
||||
superlu_path = os.path.join(dramsim_path, 'ext/SuperLU_MT_3.1/lib')
|
||||
main.Prepend(CPPPATH=Dir('.'))
|
||||
main.Append(LIBS=['dramsim3', 'superlu_mt_OPENMP', 'm', 'f77blas',
|
||||
env.Prepend(CPPPATH=Dir('.'))
|
||||
env.Append(LIBS=['dramsim3', 'superlu_mt_OPENMP', 'm', 'f77blas',
|
||||
'atlas', 'gomp'],
|
||||
LIBPATH=[dramsim_path, superlu_path])
|
||||
else:
|
||||
main.Prepend(CPPPATH=Dir('.'))
|
||||
env.Prepend(CPPPATH=Dir('.'))
|
||||
# a littel hacky but can get a shared library working
|
||||
main.Append(LIBS=['dramsim3', 'gomp'],
|
||||
env.Append(LIBS=['dramsim3', 'gomp'],
|
||||
LIBPATH=[dramsim_path], # compile-time lookup
|
||||
RPATH=[dramsim_path], # runtime lookup
|
||||
CPPPATH=[dramsim_path+'/src/'])
|
||||
|
||||
Reference in New Issue
Block a user