From e99e1e6274b0dfb0994a4b9fea16e6c9a89d8c0c Mon Sep 17 00:00:00 2001 From: jon Date: Wed, 2 Dec 2020 10:18:25 +0000 Subject: [PATCH] Update CSR names to fullish standard names. --- src_Core/CPU/CsrFile.bsv | 7 +- src_Core/RISCY_OOO/procs/lib/CSRs.bsvi | 118 ++++++++++++------------- 2 files changed, 64 insertions(+), 61 deletions(-) diff --git a/src_Core/CPU/CsrFile.bsv b/src_Core/CPU/CsrFile.bsv index c09ff4d..58490ec 100644 --- a/src_Core/CPU/CsrFile.bsv +++ b/src_Core/CPU/CsrFile.bsv @@ -809,8 +809,8 @@ module mkCsrFile #(Data hartid)(CsrFile); Reg#(Data) ret = readOnlyReg(64'b0); `ifdef PERFORMANCE_MONITORING let c = csr.addr; - if ((csrAddrMHPMCNT3.addr <= c) && (c <= csrAddrMHPMCNT31.addr)) - ret = perf_counters.counter_vec[c-csrAddrMHPMCNT3.addr]; + if ((csrAddrMHPMCOUNTER3.addr <= c) && (c <= csrAddrMHPMCOUNTER31.addr)) + ret = perf_counters.counter_vec[c-csrAddrMHPMCOUNTER3.addr]; if ((csrAddrMHPMEVENT3.addr <= c) && (c <= csrAddrMHPMEVENT31.addr)) ret = perf_counters.event_vec[c - csrAddrMHPMEVENT3.addr]; `endif @@ -855,6 +855,9 @@ module mkCsrFile #(Data hartid)(CsrFile); csrAddrMIMPID: mimpid_csr; csrAddrMHARTID: mhartid_csr; csrAddrMCCSR: csr_capcause(mccsr_reg); +`ifdef PERFORMANCE_MONITORING + csrAddrMCOUNTERINHIBIT: perf_counters.inhibit; +`endif `ifdef SECURITY csrAddrMEVBASE: mevbase_csr; csrAddrMEVMASK: mevmask_csr; diff --git a/src_Core/RISCY_OOO/procs/lib/CSRs.bsvi b/src_Core/RISCY_OOO/procs/lib/CSRs.bsvi index 85e93bf..96970e3 100644 --- a/src_Core/RISCY_OOO/procs/lib/CSRs.bsvi +++ b/src_Core/RISCY_OOO/procs/lib/CSRs.bsvi @@ -39,67 +39,67 @@ `CSR(MINSTRET, 12'hb02) `ifdef PERFORMANCE_MONITORING -`CSR(HPMCNT3, 12'hc03) -`CSR(HPMCNT4, 12'hc04) -`CSR(HPMCNT5, 12'hc05) -`CSR(HPMCNT6, 12'hc06) -`CSR(HPMCNT7, 12'hc07) -`CSR(HPMCNT8, 12'hc08) -`CSR(HPMCNT9, 12'hc09) -`CSR(HPMCNT10, 12'hc0a) -`CSR(HPMCNT11, 12'hc0b) -`CSR(HPMCNT12, 12'hc0c) -`CSR(HPMCNT13, 12'hc0d) -`CSR(HPMCNT14, 12'hc0e) -`CSR(HPMCNT15, 12'hc0f) -`CSR(HPMCNT16, 12'hc10) -`CSR(HPMCNT17, 12'hc11) -`CSR(HPMCNT18, 12'hc12) -`CSR(HPMCNT19, 12'hc13) -`CSR(HPMCNT20, 12'hc14) -`CSR(HPMCNT21, 12'hc15) -`CSR(HPMCNT22, 12'hc16) -`CSR(HPMCNT23, 12'hc17) -`CSR(HPMCNT24, 12'hc18) -`CSR(HPMCNT25, 12'hc19) -`CSR(HPMCNT26, 12'hc1a) -`CSR(HPMCNT27, 12'hc1b) -`CSR(HPMCNT28, 12'hc1c) -`CSR(HPMCNT29, 12'hc1d) -`CSR(HPMCNT30, 12'hc1e) -`CSR(HPMCNT31, 12'hc1f) +`CSR(HPMCOUNTER3, 12'hc03) +`CSR(HPMCOUNTER4, 12'hc04) +`CSR(HPMCOUNTER5, 12'hc05) +`CSR(HPMCOUNTER6, 12'hc06) +`CSR(HPMCOUNTER7, 12'hc07) +`CSR(HPMCOUNTER8, 12'hc08) +`CSR(HPMCOUNTER9, 12'hc09) +`CSR(HPMCOUNTER10, 12'hc0a) +`CSR(HPMCOUNTER11, 12'hc0b) +`CSR(HPMCOUNTER12, 12'hc0c) +`CSR(HPMCOUNTER13, 12'hc0d) +`CSR(HPMCOUNTER14, 12'hc0e) +`CSR(HPMCOUNTER15, 12'hc0f) +`CSR(HPMCOUNTER16, 12'hc10) +`CSR(HPMCOUNTER17, 12'hc11) +`CSR(HPMCOUNTER18, 12'hc12) +`CSR(HPMCOUNTER19, 12'hc13) +`CSR(HPMCOUNTER20, 12'hc14) +`CSR(HPMCOUNTER21, 12'hc15) +`CSR(HPMCOUNTER22, 12'hc16) +`CSR(HPMCOUNTER23, 12'hc17) +`CSR(HPMCOUNTER24, 12'hc18) +`CSR(HPMCOUNTER25, 12'hc19) +`CSR(HPMCOUNTER26, 12'hc1a) +`CSR(HPMCOUNTER27, 12'hc1b) +`CSR(HPMCOUNTER28, 12'hc1c) +`CSR(HPMCOUNTER29, 12'hc1d) +`CSR(HPMCOUNTER30, 12'hc1e) +`CSR(HPMCOUNTER31, 12'hc1f) -`CSR(MHPMCNT3, 12'hb03) -`CSR(MHPMCNT4, 12'hb04) -`CSR(MHPMCNT5, 12'hb05) -`CSR(MHPMCNT6, 12'hb06) -`CSR(MHPMCNT7, 12'hb07) -`CSR(MHPMCNT8, 12'hb08) -`CSR(MHPMCNT9, 12'hb09) -`CSR(MHPMCNT10, 12'hb0a) -`CSR(MHPMCNT11, 12'hb0b) -`CSR(MHPMCNT12, 12'hb0c) -`CSR(MHPMCNT13, 12'hb0d) -`CSR(MHPMCNT14, 12'hb0e) -`CSR(MHPMCNT15, 12'hb0f) -`CSR(MHPMCNT16, 12'hb10) -`CSR(MHPMCNT17, 12'hb11) -`CSR(MHPMCNT18, 12'hb12) -`CSR(MHPMCNT19, 12'hb13) -`CSR(MHPMCNT20, 12'hb14) -`CSR(MHPMCNT21, 12'hb15) -`CSR(MHPMCNT22, 12'hb16) -`CSR(MHPMCNT23, 12'hb17) -`CSR(MHPMCNT24, 12'hb18) -`CSR(MHPMCNT25, 12'hb19) -`CSR(MHPMCNT26, 12'hb1a) -`CSR(MHPMCNT27, 12'hb1b) -`CSR(MHPMCNT28, 12'hb1c) -`CSR(MHPMCNT29, 12'hb1d) -`CSR(MHPMCNT30, 12'hb1e) -`CSR(MHPMCNT31, 12'hb1f) +`CSR(MHPMCOUNTER3, 12'hb03) +`CSR(MHPMCOUNTER4, 12'hb04) +`CSR(MHPMCOUNTER5, 12'hb05) +`CSR(MHPMCOUNTER6, 12'hb06) +`CSR(MHPMCOUNTER7, 12'hb07) +`CSR(MHPMCOUNTER8, 12'hb08) +`CSR(MHPMCOUNTER9, 12'hb09) +`CSR(MHPMCOUNTER10, 12'hb0a) +`CSR(MHPMCOUNTER11, 12'hb0b) +`CSR(MHPMCOUNTER12, 12'hb0c) +`CSR(MHPMCOUNTER13, 12'hb0d) +`CSR(MHPMCOUNTER14, 12'hb0e) +`CSR(MHPMCOUNTER15, 12'hb0f) +`CSR(MHPMCOUNTER16, 12'hb10) +`CSR(MHPMCOUNTER17, 12'hb11) +`CSR(MHPMCOUNTER18, 12'hb12) +`CSR(MHPMCOUNTER19, 12'hb13) +`CSR(MHPMCOUNTER20, 12'hb14) +`CSR(MHPMCOUNTER21, 12'hb15) +`CSR(MHPMCOUNTER22, 12'hb16) +`CSR(MHPMCOUNTER23, 12'hb17) +`CSR(MHPMCOUNTER24, 12'hb18) +`CSR(MHPMCOUNTER25, 12'hb19) +`CSR(MHPMCOUNTER26, 12'hb1a) +`CSR(MHPMCOUNTER27, 12'hb1b) +`CSR(MHPMCOUNTER28, 12'hb1c) +`CSR(MHPMCOUNTER29, 12'hb1d) +`CSR(MHPMCOUNTER30, 12'hb1e) +`CSR(MHPMCOUNTER31, 12'hb1f) -`CSR(MCNTIHB, 12'h320) // Machine Counter-Inhibit +`CSR(MCOUNTERINHIBIT, 12'h320) // Machine Counter-Inhibit `CSR(MHPMEVENT3, 12'h323) `CSR(MHPMEVENT4, 12'h324)