Ayaz Akram has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/28893 )
Change subject: arch-riscv,tests: small update to make gem5.fast compile
......................................................................
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 <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/riscv/pagetable_walker.cc
M tests/gem5/.testignore
2 files changed, 2 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/riscv/pagetable_walker.cc
b/src/arch/riscv/pagetable_walker.cc
index 6ec118d..786cb81 100644
--- a/src/arch/riscv/pagetable_walker.cc
+++ b/src/arch/riscv/pagetable_walker.cc
@@ -386,10 +386,9 @@
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 cc61aa6..b8cfc7f 100644
--- a/tests/gem5/.testignore
+++ b/tests/gem5/.testignore
@@ -20,12 +20,7 @@
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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/28893
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v20.0.0.0
Gerrit-Change-Id: Id9c96d8e4682a74ec1d77a66eae53d6f9b64d302
Gerrit-Change-Number: 28893
Gerrit-PatchSet: 2
Gerrit-Owner: Ayaz Akram <yazak...@ucdavis.edu>
Gerrit-Reviewer: Ayaz Akram <yazak...@ucdavis.edu>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
