From 384705a3869726ceafc835b736c901fc394e7f07 Mon Sep 17 00:00:00 2001 From: Ayaz Akram Date: Mon, 11 May 2020 12:43:24 -0700 Subject: [PATCH] arch-riscv,tests: small update to make gem5.fast compile This small change is meant to enable gem5.fast compilation for riscv. Also, the riscv tests based on gem5.fast work now and are removed from .testignore. Change-Id: Id9c96d8e4682a74ec1d77a66eae53d6f9b64d302 Issue-On: https://gem5.atlassian.net/browse/GEM5-526 Issue-On: https://gem5.atlassian.net/browse/GEM5-527 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28893 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/arch/riscv/pagetable_walker.cc | 5 ++--- tests/gem5/.testignore | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/arch/riscv/pagetable_walker.cc b/src/arch/riscv/pagetable_walker.cc index 6ec118d56..786cb8193 100644 --- a/src/arch/riscv/pagetable_walker.cc +++ b/src/arch/riscv/pagetable_walker.cc @@ -386,10 +386,9 @@ Walker::WalkerState::stepWalk(PacketPtr &write) if (!functional) walker->tlb->insert(entry.vaddr, entry); else { - Addr offset = entry.vaddr & mask(entry.logBytes); - Addr paddr = entry.paddr << PageShift | offset; DPRINTF(PageTableWalker, "Translated %#x -> %#x\n", - entry.vaddr, paddr); + entry.vaddr, entry.paddr << PageShift | + (entry.vaddr & mask(entry.logBytes))); } } endWalk(); diff --git a/tests/gem5/.testignore b/tests/gem5/.testignore index cc61aa613..b8cfc7f50 100644 --- a/tests/gem5/.testignore +++ b/tests/gem5/.testignore @@ -20,12 +20,7 @@ test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-x86_64-debug test-insttest-rv64i-linux-DerivO3CPU-RISCV-x86_64-debug test-insttest-linux-AtomicSimpleCPU-SPARC-x86_64-debug test-insttest-linux-TimingSimpleCPU-SPARC-x86_64-debug -test-insttest-rv64a-linux-MinorCPU-RISCV-x86_64-fast -test-insttest-rv64c-linux-MinorCPU-RISCV-x86_64-fast -test-insttest-rv64d-linux-MinorCPU-RISCV-x86_64-fast -test-insttest-rv64f-linux-MinorCPU-RISCV-x86_64-fast test-insttest-rv64i-linux-MinorCPU-RISCV-x86_64-fast -test-insttest-rv64m-linux-MinorCPU-RISCV-x86_64-fast test-insttest-rv64i-linux-AtomicSimpleCPU-RISCV-x86_64-fast test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-x86_64-fast test-insttest-rv64i-linux-DerivO3CPU-RISCV-x86_64-fast -- 2.30.2