manual performance enable for dtlb

src_Core/RISCY_OOO/procs/lib/DTlb.bsv

@@ -52,12 +52,12 @@ import LatencyTimer::*;
 import HasSpecBits::*;
 import Vector::*;
 import Ehr::*;
-`ifdef PERFORMANCE_MONITORING
+// `ifdef PERFORMANCE_MONITORING
 import PerformanceMonitor::*;
 import CCTypes::*;
 import BlueUtils::*;
 import StatCounters::*;
-`endif
+// `endif
 
 export DTlbReq(..);
 export DTlbResp(..);
@@ -123,9 +123,9 @@ interface DTlb#(type instT);
 
     // performance
     interface Perf#(L1TlbPerfType) perf;
-`ifdef PERFORMANCE_MONITORING
+// `ifdef PERFORMANCE_MONITORING
     method EventsL1D events;
-`endif
+// `endif
 endinterface
 
 typedef FullAssocTlb#(DTlbSize) DTlbArray;
@@ -210,7 +210,7 @@ module mkDTlb#(
     // perf counters
     LatencyTimer#(DTlbReqNum, 12) latTimer <- mkLatencyTimer; // max latency: 4K cycles
     Fifo#(1, L1TlbPerfType) perfReqQ <- mkCFFifo;
-`ifdef PERF_COUNT
+// `ifdef PERF_COUNT
     Fifo#(1, PerfResp#(L1TlbPerfType)) perfRespQ <- mkCFFifo;
     Reg#(Bool) doStats <- mkConfigReg(False);
     Count#(Data) accessCnt <- mkCount(0);
@@ -251,10 +251,10 @@ module mkDTlb#(
         function Bool isMiss(DTlbWait x) = x != None;
         when(all(isMiss, readVReg(pendWait)), allMissCycles.incr(1));
     endrule
-`endif
+// `endif
-`ifdef PERFORMANCE_MONITORING
+// `ifdef PERFORMANCE_MONITORING
     Array #(Reg #(EventsL1D)) perf_events <- mkDRegOR (3, unpack (0));
-`endif
+// `endif
 
     // do flush: start when all misses resolve
     Bool noMiss = all(\== (False) , readVReg(pendValid_noMiss));
@@ -265,11 +265,11 @@ module mkDTlb#(
         flushRqToPQ.enq(?);
         waitFlushP <= True;
         if(verbose) $display("[DTLB] flush begin");
-`ifdef PERFORMANCE_MONITORING
+// `ifdef PERFORMANCE_MONITORING
         EventsL1D ev = unpack(0);
         ev.evt_TLB_FLUSH = 1;
         perf_events[2] <= ev;
-`endif
+// `endif
     endrule
 
     rule doFinishFlush(needFlush && waitFlushP);
@@ -365,7 +365,7 @@ module mkDTlb#(
 
         // perf: miss
         let lat <- latTimer.done(idx);
-`ifdef PERF_COUNT
+// `ifdef PERF_COUNT
         if(doStats) begin
             if(isValid(respForOtherReq)) begin
                 missPeerLat.incr(zeroExtend(lat));
@@ -376,13 +376,13 @@ module mkDTlb#(
                 missParentCnt.incr(1);
             end
         end
-`endif
+// `endif
-`ifdef PERFORMANCE_MONITORING
+// `ifdef PERFORMANCE_MONITORING
         EventsL1D ev = unpack(0);
         ev.evt_TLB_MISS_LAT = saturating_truncate(lat);
         ev.evt_TLB_MISS = 1;
         perf_events[0] <= ev;
-`endif
+// `endif
         // conflict with wrong spec
         wrongSpec_doPRs_conflict.wset(?);
     endrule
@@ -573,17 +573,17 @@ module mkDTlb#(
             if(verbose) $display("DTLB %m req (bare): ", fshow(r));
         end
 
-`ifdef PERF_COUNT
+// `ifdef PERF_COUNT
         // perf: access
         if(doStats) begin
             accessCnt.incr(1);
         end
-`endif
+// `endif
-`ifdef PERFORMANCE_MONITORING
+// `ifdef PERFORMANCE_MONITORING
         EventsL1D ev = unpack(0);
         ev.evt_TLB = 1;
         perf_events[1] <= ev;
-`endif
+// `endif
         // conflict with wrong spec
         wrongSpec_procReq_conflict.wset(?);
     endmethod
@@ -640,11 +640,11 @@ module mkDTlb#(
 
     interface Perf perf;
         method Action setStatus(Bool stats);
-`ifdef PERF_COUNT
+// `ifdef PERF_COUNT
             doStats <= stats;
-`else
+// `else
-            noAction;
+//             noAction;
-`endif
+// `endif
         endmethod
 
         method Action req(L1TlbPerfType r);
@@ -652,27 +652,27 @@ module mkDTlb#(
         endmethod
 
         method ActionValue#(PerfResp#(L1TlbPerfType)) resp;
-`ifdef PERF_COUNT
+// `ifdef PERF_COUNT
             perfRespQ.deq;
             return perfRespQ.first;
-`else
+// `else
-            perfReqQ.deq;
+//             perfReqQ.deq;
-            return PerfResp {
+//             return PerfResp {
-                pType: perfReqQ.first,
+//                 pType: perfReqQ.first,
-                data: 0
+//                 data: 0
-            };
+//             };
-`endif
+// `endif
         endmethod
 
         method Bool respValid;
-`ifdef PERF_COUNT
+// `ifdef PERF_COUNT
             return perfRespQ.notEmpty;
-`else
+// `else
-            return perfReqQ.notEmpty;
+//             return perfReqQ.notEmpty;
-`endif
+// `endif
         endmethod
     endinterface
-`ifdef PERFORMANCE_MONITORING
+// `ifdef PERFORMANCE_MONITORING
     method EventsL1D events = perf_events[0];
-`endif
+// `endif
 endmodule