From 24e87cb1c5e5b28923a544d6fd18c8bd0a458023 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 7 Sep 2020 00:08:58 -0700 Subject: [PATCH] gpu: Stop using TheISA in the GPU TLB. This class is defined inside the X86ISA namespace, so there's no point in pretending it's generic. Remove TheISA and let the code access what it needs from X86ISA naturally since it's there already. Change-Id: I21b5d2d2b9af6aa0c10ddbb5b3ddca1692188dcc Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34173 Tested-by: kokoro Reviewed-by: Matthew Poremba Reviewed-by: Matt Sinclair Maintainer: Matt Sinclair --- src/gpu-compute/gpu_tlb.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gpu-compute/gpu_tlb.cc b/src/gpu-compute/gpu_tlb.cc index 4c3539698..54c3729e9 100644 --- a/src/gpu-compute/gpu_tlb.cc +++ b/src/gpu-compute/gpu_tlb.cc @@ -164,7 +164,7 @@ namespace X86ISA * vpn holds the virtual page address * The least significant bits are simply masked */ - int set = (vpn >> TheISA::PageShift) & setMask; + int set = (vpn >> PageShift) & setMask; if (!freeList[set].empty()) { newEntry = freeList[set].front(); @@ -184,7 +184,7 @@ namespace X86ISA GpuTLB::EntryList::iterator GpuTLB::lookupIt(Addr va, bool update_lru) { - int set = (va >> TheISA::PageShift) & setMask; + int set = (va >> PageShift) & setMask; if (FA) { assert(!set); @@ -214,7 +214,7 @@ namespace X86ISA TlbEntry* GpuTLB::lookup(Addr va, bool update_lru) { - int set = (va >> TheISA::PageShift) & setMask; + int set = (va >> PageShift) & setMask; auto entry = lookupIt(va, update_lru); @@ -266,7 +266,7 @@ namespace X86ISA GpuTLB::demapPage(Addr va, uint64_t asn) { - int set = (va >> TheISA::PageShift) & setMask; + int set = (va >> PageShift) & setMask; auto entry = lookupIt(va, false); if (entry != entryList[set].end()) { -- 2.30.2