From 521d04f92f0ea4c319842d748e0a12333a344aa9 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 13 May 2021 13:31:57 -0700 Subject: [PATCH] arch-gcn3: Fixing .fast compilation for gcn3 DPRINTF was altered here: https://gem5-review.googlesource.com/c/public/gem5/+/44988. This change results in DPRINTFs always compiling. As such, the variables decladed within NDEBUG ifdefs, and later used in DPRINTFs, cause an error when compiling .fast. In this patch the NDEBUG ifdefs have been removed. Change-Id: I54992cfe152c84b265e64e1389bf2656c95ba42e Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45481 Reviewed-by: Matthew Poremba Reviewed-by: Matt Sinclair Maintainer: Matthew Poremba Maintainer: Matt Sinclair Tested-by: kokoro --- src/gpu-compute/gpu_tlb.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gpu-compute/gpu_tlb.cc b/src/gpu-compute/gpu_tlb.cc index f0afd8275f..dfe9a48953 100644 --- a/src/gpu-compute/gpu_tlb.cc +++ b/src/gpu-compute/gpu_tlb.cc @@ -960,10 +960,10 @@ namespace X86ISA Process *p = sender_state->tc->getProcessPtr(); Addr vaddr = pkt->req->getVaddr(); - #ifndef NDEBUG + Addr alignedVaddr = p->pTable->pageAlign(vaddr); assert(alignedVaddr == virtPageAddr); - #endif + const EmulationPageTable::Entry *pte = p->pTable->lookup(vaddr); if (!pte && sender_state->tlbMode != BaseTLB::Execute && p->fixupFault(vaddr)) { @@ -1164,10 +1164,9 @@ namespace X86ISA Process *p = tc->getProcessPtr(); Addr vaddr = pkt->req->getVaddr(); - #ifndef NDEBUG + Addr alignedVaddr = p->pTable->pageAlign(vaddr); assert(alignedVaddr == virt_page_addr); - #endif const EmulationPageTable::Entry *pte = p->pTable->lookup(vaddr);