[gem5-dev] Change in gem5/gem5[master]: arch-arm: Do not check MustBeOne flag for TLB requests from the prefe...

2019-05-14 Thread Javier Bueno Hedo (Gerrit)
Javier Bueno Hedo has submitted this change and it was merged. (  
https://gem5-review.googlesource.com/c/public/gem5/+/18768 )


Change subject: arch-arm: Do not check MustBeOne flag for TLB requests from  
the prefetcher

..

arch-arm: Do not check MustBeOne flag for TLB requests from the prefetcher

Allow TLB requests generated from prefetchers to override the
MustBeOne arch flag. This allows the prefetchers to issue requests
without having to know architecutre-specific flags.

Change-Id: Id83e0c93f3d1a614da11c4f344ab4dc594423672
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18768
Reviewed-by: Nikos Nikoleris 
Reviewed-by: Andreas Sandberg 
Maintainer: Andreas Sandberg 
Tested-by: kokoro 
---
M src/arch/arm/tlb.cc
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
  Nikos Nikoleris: Looks good to me, approved
  kokoro: Regressions pass



diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index 4b43a50..f30e195 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -586,7 +586,7 @@
 bool is_write = (mode == Write);

 if (!is_fetch) {
-assert(flags & MustBeOne);
+assert(flags & MustBeOne || req->isPrefetch());
 if (sctlr.a || !(flags & AllowUnaligned)) {
 if (vaddr & mask(flags & AlignmentMask)) {
 // LPAE is always disabled in SE mode
@@ -1038,7 +1038,7 @@
 req->setFlags(Request::STRICT_ORDER);
 }
 if (!is_fetch) {
-assert(flags & MustBeOne);
+assert(flags & MustBeOne || req->isPrefetch());
 if (sctlr.a || !(flags & AllowUnaligned)) {
 if (vaddr & mask(flags & AlignmentMask)) {
 alignFaults++;

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18768
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Id83e0c93f3d1a614da11c4f344ab4dc594423672
Gerrit-Change-Number: 18768
Gerrit-PatchSet: 2
Gerrit-Owner: Javier Bueno Hedo 
Gerrit-Reviewer: Andreas Sandberg 
Gerrit-Reviewer: Giacomo Travaglini 
Gerrit-Reviewer: Javier Bueno Hedo 
Gerrit-Reviewer: Nikos Nikoleris 
Gerrit-Reviewer: kokoro 
Gerrit-CC: Sudhanshu Jha 
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev

[gem5-dev] Change in gem5/gem5[master]: arch-arm: Do not check MustBeOne flag for TLB requests from the prefe...

2019-05-14 Thread Javier Bueno Hedo (Gerrit)
Javier Bueno Hedo has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/18768



Change subject: arch-arm: Do not check MustBeOne flag for TLB requests from  
the prefetcher

..

arch-arm: Do not check MustBeOne flag for TLB requests from the prefetcher

Allow TLB requests generated from prefetchers to override the
MustBeOne arch flag. This allows the prefetchers to issue requests
without having to know architecutre-specific flags.

Change-Id: Id83e0c93f3d1a614da11c4f344ab4dc594423672
---
M src/arch/arm/tlb.cc
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index 4b43a50..f30e195 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -586,7 +586,7 @@
 bool is_write = (mode == Write);

 if (!is_fetch) {
-assert(flags & MustBeOne);
+assert(flags & MustBeOne || req->isPrefetch());
 if (sctlr.a || !(flags & AllowUnaligned)) {
 if (vaddr & mask(flags & AlignmentMask)) {
 // LPAE is always disabled in SE mode
@@ -1038,7 +1038,7 @@
 req->setFlags(Request::STRICT_ORDER);
 }
 if (!is_fetch) {
-assert(flags & MustBeOne);
+assert(flags & MustBeOne || req->isPrefetch());
 if (sctlr.a || !(flags & AllowUnaligned)) {
 if (vaddr & mask(flags & AlignmentMask)) {
 alignFaults++;

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18768
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Id83e0c93f3d1a614da11c4f344ab4dc594423672
Gerrit-Change-Number: 18768
Gerrit-PatchSet: 1
Gerrit-Owner: Javier Bueno Hedo 
Gerrit-MessageType: newchange
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev