Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/51829 )
Change subject: arch: Only build GPU switching headers if building the GPU.
......................................................................
arch: Only build GPU switching headers if building the GPU.
Otherwise, SCons may discover an include which is guarded with BUILD_GPU
(like GPUCoalescer in mem/ruby/profiler/Profiler.cc), but not understand
that BUILD_GPU is not true. It will then follow the includes and find
generated headers which it will then generate, specifically X86 headers
for X86TLB and X86Pagetable param structs.
If not using x86, for instance if building the NULL isa, it may not be
possible to generate those headers because those objects are not visible
to SCons.
Change-Id: I955d0ef6ffb146eeb99bb052d29abe835cac5d9a
---
M src/arch/SConscript
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/arch/SConscript b/src/arch/SConscript
index 2616768..993bd6b 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -69,15 +69,16 @@
amdgpu_isa = ['gcn3', 'vega']
-env.SwitchingHeaders(
- Split('''
- gpu_decoder.hh
- gpu_isa.hh
- gpu_registers.hh
- gpu_types.hh
- '''),
- '{}'.format('amdgpu/' if env['TARGET_GPU_ISA'] in amdgpu_isa else '')+
- env.subst('${TARGET_GPU_ISA}'))
+if env['BUILD_GPU']:
+ env.SwitchingHeaders(
+ Split('''
+ gpu_decoder.hh
+ gpu_isa.hh
+ gpu_registers.hh
+ gpu_types.hh
+ '''),
+ '{}'.format('amdgpu/' if env['TARGET_GPU_ISA'] in amdgpu_isa
else '')+
+ env.subst('${TARGET_GPU_ISA}'))
#################################################################
#
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51829
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: I955d0ef6ffb146eeb99bb052d29abe835cac5d9a
Gerrit-Change-Number: 51829
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
