From a855e0170ef39fe989d27e6989df5060fe73fa13 Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Sat, 17 Jul 2021 15:01:01 -0400
Subject: [PATCH] hptw: Propagating PageTableEntryF removal through LSU
---
wally-pipelined/src/lsu/lsu.sv | 11 ++++-------
wally-pipelined/src/wally/wallypipelinedhart.sv | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/wally-pipelined/src/lsu/lsu.sv b/wally-pipelined/src/lsu/lsu.sv
index 291db2596..fd65dcb21 100644
--- a/wally-pipelined/src/lsu/lsu.sv
+++ b/wally-pipelined/src/lsu/lsu.sv
@@ -81,7 +81,7 @@ module lsu
input logic [`XLEN-1:0] PCF,
input logic ITLBMissF,
- output logic [`XLEN-1:0] PageTableEntryF,
+ output logic [`XLEN-1:0] PTE,
output logic [1:0] PageType,
output logic ITLBWriteF,
output logic WalkerInstrPageFaultF,
@@ -118,7 +118,7 @@ module lsu
logic [`PA_BITS-1:0] MemPAdrM; // from mmu to dcache
logic DTLBMissM;
- logic [`XLEN-1:0] PTE, PageTableEntryM;
+// logic [`XLEN-1:0] PTE;
logic DTLBWriteM;
logic [`XLEN-1:0] HPTWReadPTE;
logic HPTWStall;
@@ -158,7 +158,6 @@ module lsu
.DTLBMissM(DTLBMissM),
.MemRWM(MemRWM),
.PTE(PTE),
-// .PageTableEntryM(PageTableEntryM),
.PageType,
.ITLBWriteF(ITLBWriteF),
.DTLBWriteM(DTLBWriteM),
@@ -172,8 +171,7 @@ module lsu
.WalkerLoadPageFaultM(WalkerLoadPageFaultM),
.WalkerStorePageFaultM(WalkerStorePageFaultM));
- assign PageTableEntryM = PTE;
- assign PageTableEntryF = PTE;
+// assign PageTableEntryF = PTE;
assign WalkerPageFaultM = WalkerStorePageFaultM | WalkerLoadPageFaultM;
@@ -185,7 +183,6 @@ module lsu
.HPTWRead(HPTWRead),
.HPTWPAdrE(HPTWPAdrE),
.HPTWPAdrM(HPTWPAdrM),
- //.HPTWReadPTE(HPTWReadPTE),
.HPTWStall(HPTWStall),
// CPU connection
.MemRWM(MemRWM),
@@ -221,7 +218,7 @@ module lsu
mmu #(.TLB_ENTRIES(`DTLB_ENTRIES), .IMMU(0))
dmmu(.Address(MemAdrMtoDCache),
.Size(Funct3MtoDCache[1:0]),
- .PTE(PageTableEntryM),
+ .PTE(PTE),
.PageTypeWriteVal(PageType),
.TLBWrite(DTLBWriteM),
.TLBFlush(DTLBFlushM),
diff --git a/wally-pipelined/src/wally/wallypipelinedhart.sv b/wally-pipelined/src/wally/wallypipelinedhart.sv
index fc71e6c1b..a5102ab84 100644
--- a/wally-pipelined/src/wally/wallypipelinedhart.sv
+++ b/wally-pipelined/src/wally/wallypipelinedhart.sv
@@ -225,7 +225,7 @@ module wallypipelinedhart
.PCF(PCF),
.ITLBMissF(ITLBMissF),
- .PageTableEntryF(PageTableEntryF),
+ .PTE(PageTableEntryF),
.PageType,
.ITLBWriteF(ITLBWriteF),
.WalkerInstrPageFaultF(WalkerInstrPageFaultF),