misc: Clean up usage of arch/isa_traits.hh.

isa_traits.hh used to have much more in it, but now it only has
PageShift, PageBytes, and (for now) the guest endianness. These values
should only be retrieved from the System class generally speaking, so
only the system class should include arch/isa_traits.hh.

Some gpu compute related files need PageBytes or PageShift. Even though
those files don't advertise their ISA dependence, they are tied to x86.
In those files, they can include arch/x86/isa_traits.hh.

The only other file which legitimately needs arch/isa_traits.hh is the
decoder cache since it uses PageBytes to size an array.

Change-Id: I12686368715623e3140a68a7027c136bd52567b1
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33203
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/arch/generic/memhelpers.hh

@@ -41,7 +41,6 @@
 #ifndef __ARCH_GENERIC_MEMHELPERS_HH__
 #define __ARCH_GENERIC_MEMHELPERS_HH__
 
-#include "arch/isa_traits.hh"
 #include "base/types.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"

src/arch/riscv/registers.hh

@@ -52,7 +52,6 @@
 #include "arch/generic/types.hh"
 #include "arch/generic/vec_pred_reg.hh"
 #include "arch/generic/vec_reg.hh"
-#include "arch/isa_traits.hh"
 #include "arch/riscv/generated/max_inst_regs.hh"
 #include "base/types.hh"
 

src/cpu/base.hh

@@ -51,7 +51,6 @@
 #include "arch/null/cpu_dummy.hh"
 #else
 #include "arch/generic/interrupts.hh"
-#include "arch/isa_traits.hh"
 #include "base/statistics.hh"
 #include "mem/port_proxy.hh"
 #include "sim/clocked_object.hh"

src/cpu/checker/cpu_impl.hh

@@ -45,7 +45,6 @@
 #include <list>
 #include <string>
 
-#include "arch/isa_traits.hh"
 #include "base/refcnt.hh"
 #include "config/the_isa.hh"
 #include "cpu/base_dyn_inst.hh"

src/cpu/exetrace.cc

@@ -43,7 +43,6 @@
 #include <iomanip>
 #include <sstream>
 
-#include "arch/isa_traits.hh"
 #include "arch/utility.hh"
 #include "base/loader/symtab.hh"
 #include "config/the_isa.hh"

src/cpu/o3/dyn_inst.hh

@@ -44,7 +44,6 @@
 
 #include <array>
 
-#include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"

src/cpu/o3/fetch_impl.hh

@@ -49,7 +49,6 @@
 #include <queue>
 
 #include "arch/generic/tlb.hh"
-#include "arch/isa_traits.hh"
 #include "arch/utility.hh"
 #include "base/random.hh"
 #include "base/types.hh"

src/cpu/o3/impl.hh

@@ -29,7 +29,6 @@
 #ifndef __CPU_O3_IMPL_HH__
 #define __CPU_O3_IMPL_HH__
 
-#include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/cpu_policy.hh"
 

src/cpu/o3/lsq_unit.hh

@@ -49,7 +49,6 @@
 
 #include "arch/generic/debugfaults.hh"
 #include "arch/generic/vec_reg.hh"
-#include "arch/isa_traits.hh"
 #include "arch/locked_mem.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"

src/cpu/o3/regfile.hh

@@ -44,7 +44,6 @@
 
 #include <vector>
 
-#include "arch/isa_traits.hh"
 #include "arch/types.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"

src/cpu/o3/rename_impl.hh

@@ -44,7 +44,6 @@
 
 #include <list>
 
-#include "arch/isa_traits.hh"
 #include "arch/registers.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/rename.hh"

src/cpu/pred/bpred_unit.cc

@@ -44,7 +44,6 @@
 
 #include <algorithm>
 
-#include "arch/isa_traits.hh"
 #include "arch/types.hh"
 #include "arch/utility.hh"
 #include "base/trace.hh"

src/cpu/pred/simple_indirect.hh

@@ -31,7 +31,6 @@
 
 #include <deque>
 
-#include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/pred/indirect.hh"

src/cpu/simple_thread.cc

@@ -42,7 +42,6 @@
 
 #include <string>
 
-#include "arch/isa_traits.hh"
 #include "arch/utility.hh"
 #include "base/callback.hh"
 #include "base/compiler.hh"

src/cpu/simple_thread.hh

@@ -47,7 +47,6 @@
 #include "arch/decoder.hh"
 #include "arch/generic/tlb.hh"
 #include "arch/isa.hh"
-#include "arch/isa_traits.hh"
 #include "arch/registers.hh"
 #include "arch/types.hh"
 #include "base/types.hh"

src/dev/storage/ide_disk.cc

@@ -49,7 +49,6 @@
 #include <deque>
 #include <string>
 
-#include "arch/isa_traits.hh"
 #include "base/chunk_generator.hh"
 #include "base/cprintf.hh" // csprintf
 #include "base/trace.hh"

src/dev/virtio/base.hh

@@ -40,7 +40,6 @@
 
 #include <functional>
 
-#include "arch/isa_traits.hh"
 #include "base/bitunion.hh"
 #include "dev/virtio/virtio_ring.h"
 #include "mem/port_proxy.hh"

src/gpu-compute/compute_unit.cc

@@ -35,6 +35,7 @@
 
 #include <limits>
 
+#include "arch/x86/isa_traits.hh"
 #include "base/output.hh"
 #include "debug/GPUDisp.hh"
 #include "debug/GPUExec.hh"

src/gpu-compute/gpu_tlb.cc

@@ -40,6 +40,7 @@
 
 #include "arch/x86/faults.hh"
 #include "arch/x86/insts/microldstop.hh"
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/pagetable.hh"
 #include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/regs/misc.hh"

src/gpu-compute/shader.cc

@@ -35,6 +35,7 @@
 
 #include <limits>
 
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/linux/linux.hh"
 #include "base/chunk_generator.hh"
 #include "debug/GPUDisp.hh"

src/gpu-compute/shader.hh

@@ -40,7 +40,6 @@
 #include <string>
 
 #include "arch/isa.hh"
-#include "arch/isa_traits.hh"
 #include "base/types.hh"
 #include "cpu/simple/atomic.hh"
 #include "cpu/simple/timing.hh"

src/gpu-compute/tlb_coalescer.cc

@@ -35,6 +35,7 @@
 
 #include <cstring>
 
+#include "arch/x86/isa_traits.hh"
 #include "base/logging.hh"
 #include "debug/GPUTLB.hh"
 #include "sim/process.hh"

src/gpu-compute/tlb_coalescer.hh

@@ -41,7 +41,6 @@
 
 #include "arch/generic/tlb.hh"
 #include "arch/isa.hh"
-#include "arch/isa_traits.hh"
 #include "arch/x86/pagetable.hh"
 #include "arch/x86/regs/segment.hh"
 #include "base/logging.hh"

src/kern/linux/helpers.cc

@@ -37,7 +37,6 @@
 
 #include "kern/linux/helpers.hh"
 
-#include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
 #include "mem/port_proxy.hh"

src/mem/cache/prefetch/base.hh

@@ -48,7 +48,6 @@
 
 #include <cstdint>
 
-#include "arch/isa_traits.hh"
 #include "arch/generic/tlb.hh"
 #include "base/statistics.hh"
 #include "base/types.hh"

src/sim/faults.cc

@@ -28,7 +28,6 @@
 
 #include "sim/faults.hh"
 
-#include "arch/isa_traits.hh"
 #include "base/logging.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"

src/sim/process.cc

@@ -318,7 +318,7 @@ Process::drain()
 void
 Process::allocateMem(Addr vaddr, int64_t size, bool clobber)
 {
-    int npages = divCeil(size, (int64_t)PageBytes);
+    int npages = divCeil(size, (int64_t)system->getPageBytes());
     Addr paddr = system->allocPhysPages(npages);
     pTable->map(vaddr, paddr, size,
                 clobber ? EmulationPageTable::Clobber :
@@ -333,14 +333,14 @@ Process::replicatePage(Addr vaddr, Addr new_paddr, ThreadContext *old_tc,
         new_paddr = system->allocPhysPages(1);
 
     // Read from old physical page.
-    uint8_t *buf_p = new uint8_t[PageBytes];
-    old_tc->getVirtProxy().readBlob(vaddr, buf_p, PageBytes);
+    uint8_t *buf_p = new uint8_t[system->getPageBytes()];
+    old_tc->getVirtProxy().readBlob(vaddr, buf_p, system->getPageBytes());
 
     // Create new mapping in process address space by clobbering existing
     // mapping (if any existed) and then write to the new physical page.
     bool clobber = true;
-    pTable->map(vaddr, new_paddr, PageBytes, clobber);
-    new_tc->getVirtProxy().writeBlob(vaddr, buf_p, PageBytes);
+    pTable->map(vaddr, new_paddr, system->getPageBytes(), clobber);
+    new_tc->getVirtProxy().writeBlob(vaddr, buf_p, system->getPageBytes());
     delete[] buf_p;
 }
 
@@ -442,7 +442,7 @@ Process::updateBias()
 
     // Determine how large the interpreters footprint will be in the process
     // address space.
-    Addr interp_mapsize = roundUp(interp->mapSize(), TheISA::PageBytes);
+    Addr interp_mapsize = roundUp(interp->mapSize(), system->getPageBytes());
 
     // We are allocating the memory area; set the bias to the lowest address
     // in the allocated memory region.

src/sim/syscall_emul.cc

@@ -241,7 +241,7 @@ exitGroupFunc(SyscallDesc *desc, ThreadContext *tc, int status)
 SyscallReturn
 getpagesizeFunc(SyscallDesc *desc, ThreadContext *tc)
 {
-    return (int)PageBytes;
+    return (int)tc->getSystemPtr()->getPageBytes();
 }