From e5a3584df764bf970f832bda30821de8a758ff4b Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 14 Sep 2020 19:46:47 -0700 Subject: [PATCH] mem-ruby: Remove conditional includes based on THE_ISA in ruby. These were including instruction class definitions from x86 for some reason. There was no code in those .cc files which actually used anything from them, as evidenced by the fact that the GCN3_X86 build still works. No other code in the file was conditionally compiled as of today. Change-Id: I3cef8348fb601dd7af67665cf64bbf514c91c3db Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34577 Reviewed-by: Matthew Poremba Maintainer: Bobby R. Bruce Tested-by: kokoro --- src/mem/ruby/system/GPUCoalescer.cc | 9 ++------- src/mem/ruby/system/VIPERCoalescer.cc | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/mem/ruby/system/GPUCoalescer.cc b/src/mem/ruby/system/GPUCoalescer.cc index 03c392f7f..f5d4f02bd 100644 --- a/src/mem/ruby/system/GPUCoalescer.cc +++ b/src/mem/ruby/system/GPUCoalescer.cc @@ -31,16 +31,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/system/GPUCoalescer.hh" + #include "base/logging.hh" #include "base/str.hh" #include "config/the_isa.hh" - -#if THE_ISA == X86_ISA -#include "arch/x86/insts/microldstop.hh" - -#endif // X86_ISA -#include "mem/ruby/system/GPUCoalescer.hh" - #include "cpu/testers/rubytest/RubyTester.hh" #include "debug/GPUCoalescer.hh" #include "debug/MemoryAccess.hh" diff --git a/src/mem/ruby/system/VIPERCoalescer.cc b/src/mem/ruby/system/VIPERCoalescer.cc index a8a3aa952..82c7f0052 100644 --- a/src/mem/ruby/system/VIPERCoalescer.cc +++ b/src/mem/ruby/system/VIPERCoalescer.cc @@ -31,16 +31,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/system/VIPERCoalescer.hh" + #include "base/logging.hh" #include "base/str.hh" #include "config/the_isa.hh" - -#if THE_ISA == X86_ISA -#include "arch/x86/insts/microldstop.hh" - -#endif // X86_ISA -#include "mem/ruby/system/VIPERCoalescer.hh" - #include "cpu/testers/rubytest/RubyTester.hh" #include "debug/GPUCoalescer.hh" #include "debug/MemoryAccess.hh" -- 2.30.2