[gem5-dev] Change in gem5/gem5[develop]: scons: Make the sim_objects parameter of SimObject mandantory.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/54143 )

Change subject: scons: Make the sim_objects parameter of SimObject  
mandantory.
......................................................................

scons: Make the sim_objects parameter of SimObject mandantory.

If there really are no c++ sim_objects in the file, then sim_objects can
be set to [] which it used to default to.

This way, if someone hasn't remembered to update their SConscript files
for the new sim_objects and enums parameters, this will give them some
indication what's wrong, rather than the build just failing later.

Change-Id: Ic1933f7b9dfff7dd7e403c6c84f1f510c8ee8c72
---
M src/cpu/o3/SConscript
M src/base/SConscript
M src/gpu-compute/SConscript
M src/systemc/SConscript
M src/SConscript
M src/cpu/SConscript
M src/dev/SConscript
7 files changed, 24 insertions(+), 7 deletions(-)



diff --git a/src/SConscript b/src/SConscript
index 7eb810a..feaacf2 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -149,7 +149,7 @@
     enums = dict()
     tags = dict()

-    def __init__(self, source, *, sim_objects=[], enums=[],
+    def __init__(self, source, sim_objects, *, enums=[],
             tags=None, add_tags=None):
         '''Specify the source file and any tags (automatically in
         the m5.objects package)'''
diff --git a/src/base/SConscript b/src/base/SConscript
index c49e2ae..6c98500 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -28,7 +28,7 @@

 Import('*')

-SimObject('Graphics.py', enums=['ImageFormat'])
+SimObject('Graphics.py', sim_objects=[], enums=['ImageFormat'])
 GTest('amo.test', 'amo.test.cc')
 Source('atomicio.cc', add_tags='gem5 trace')
 GTest('atomicio.test', 'atomicio.test.cc', 'atomicio.cc')
diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index 4dcec7c..762f281 100644
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -83,7 +83,7 @@
 Source('pc_event.cc')

 SimObject('FuncUnit.py', sim_objects=['OpDesc', 'FUDesc'],  
enums=['OpClass'])
-SimObject('StaticInstFlags.py', enums=['StaticInstFlags'])
+SimObject('StaticInstFlags.py', sim_objects=[], enums=['StaticInstFlags'])

 if env['TARGET_ISA'] == 'null':
     Return()
diff --git a/src/cpu/o3/SConscript b/src/cpu/o3/SConscript
index a20e30d..ba021a8 100755
--- a/src/cpu/o3/SConscript
+++ b/src/cpu/o3/SConscript
@@ -32,7 +32,7 @@

 if 'O3CPU' in env['CPU_MODELS']:
     SimObject('FUPool.py', sim_objects=['FUPool'])
-    SimObject('FuncUnitConfig.py')
+    SimObject('FuncUnitConfig.py', sim_objects=[])
     SimObject('O3CPU.py', sim_objects=['O3CPU'], enums=[
         'SMTFetchPolicy', 'SMTQueuePolicy', 'CommitPolicy'])

diff --git a/src/dev/SConscript b/src/dev/SConscript
index db3163e..755ddb5 100644
--- a/src/dev/SConscript
+++ b/src/dev/SConscript
@@ -35,7 +35,7 @@
 Source('dma_device.cc')
 Source('dma_virt_device.cc')

-SimObject('IntPin.py')
+SimObject('IntPin.py', sim_objects=[])
 Source('intpin.cc')

 DebugFlag('IsaFake')
diff --git a/src/gpu-compute/SConscript b/src/gpu-compute/SConscript
index c6404bc..09a431b 100644
--- a/src/gpu-compute/SConscript
+++ b/src/gpu-compute/SConscript
@@ -40,7 +40,8 @@
     'ComputeUnit', 'Shader', 'GPUComputeDriver', 'GPURenderDriver',
     'GPUDispatcher', 'GPUCommandProcessor'],
     enums=['PrefetchType', 'GfxVersion', 'StorageClassType'])
-SimObject('GPUStaticInstFlags.py', enums=['GPUStaticInstFlags'])
+SimObject('GPUStaticInstFlags.py', sim_objects=[],
+    enums=['GPUStaticInstFlags'])
 SimObject('LdsState.py', sim_objects=['LdsState'])

 Source('comm.cc')
diff --git a/src/systemc/SConscript b/src/systemc/SConscript
index ef7e79b..57cb1d9 100644
--- a/src/systemc/SConscript
+++ b/src/systemc/SConscript
@@ -32,4 +32,4 @@

 env.Append(CPPPATH=Dir('ext'))

-SimObject('Tlm.py')
+SimObject('Tlm.py', sim_objects=[])

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54143
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ic1933f7b9dfff7dd7e403c6c84f1f510c8ee8c72
Gerrit-Change-Number: 54143
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s