colin
/
risc-v-tlm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added performace information for data memory accesses

This commit is contained in:
mariusmonton 2021-01-31 12:00:25 +01:00
parent 337e267218
commit 622da9872a
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/A_extension.cpp
View File

@ -71,6 +71,7 @@ bool A_extension::Exec_A_LR() {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
TLB_reserve(mem_addr); TLB_reserve(mem_addr);
@ -95,6 +96,7 @@ bool A_extension::Exec_A_SC() {
if (TLB_reserved(mem_addr) == true) { if (TLB_reserved(mem_addr) == true) {
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
regs->setValue(rd, 0); // SC writes 0 to rd on success regs->setValue(rd, 0); // SC writes 0 to rd on success
} else { } else {
regs->setValue(rd, 1); // SC writes nonzero on failure regs->setValue(rd, 1); // SC writes nonzero on failure
@ -121,7 +123,7 @@ bool A_extension::Exec_A_AMOSWAP() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
// swap // swap
@ -129,6 +131,7 @@ bool A_extension::Exec_A_AMOSWAP() const {
regs->setValue(rs2, data); regs->setValue(rs2, data);
mem_intf->writeDataMem(mem_addr, aux, 4); mem_intf->writeDataMem(mem_addr, aux, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOSWAP " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOSWAP " << std::endl;
return true; return true;
@ -147,6 +150,7 @@ bool A_extension::Exec_A_AMOADD() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -154,6 +158,7 @@ bool A_extension::Exec_A_AMOADD() const {
data = data + regs->getValue(rs2); data = data + regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOADD " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOADD " << std::endl;
@ -173,6 +178,7 @@ bool A_extension::Exec_A_AMOXOR() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -180,6 +186,7 @@ bool A_extension::Exec_A_AMOXOR() const {
data = data ^ regs->getValue(rs2); data = data ^ regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOXOR " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOXOR " << std::endl;
@ -198,6 +205,7 @@ bool A_extension::Exec_A_AMOAND() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -205,6 +213,7 @@ bool A_extension::Exec_A_AMOAND() const {
data = data & regs->getValue(rs2); data = data & regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOAND " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOAND " << std::endl;
@ -224,6 +233,7 @@ bool A_extension::Exec_A_AMOOR() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -231,6 +241,7 @@ bool A_extension::Exec_A_AMOOR() const {
data = data | regs->getValue(rs2); data = data | regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOOR " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOOR " << std::endl;
return true; return true;
@ -250,6 +261,7 @@ bool A_extension::Exec_A_AMOMIN() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -260,6 +272,7 @@ bool A_extension::Exec_A_AMOMIN() const {
} }
mem_intf->writeDataMem(mem_addr, aux, 4); mem_intf->writeDataMem(mem_addr, aux, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOMIN " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOMIN " << std::endl;
@ -279,6 +292,7 @@ bool A_extension::Exec_A_AMOMAX() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -289,6 +303,7 @@ bool A_extension::Exec_A_AMOMAX() const {
} }
mem_intf->writeDataMem(mem_addr, aux, 4); mem_intf->writeDataMem(mem_addr, aux, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOMAX " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOMAX " << std::endl;
@ -308,6 +323,7 @@ bool A_extension::Exec_A_AMOMINU() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -318,6 +334,7 @@ bool A_extension::Exec_A_AMOMINU() const {
} }
mem_intf->writeDataMem(mem_addr, aux, 4); mem_intf->writeDataMem(mem_addr, aux, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOMINU " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOMINU " << std::endl;
@ -337,6 +354,7 @@ bool A_extension::Exec_A_AMOMAXU() const {
mem_addr = regs->getValue(rs1); mem_addr = regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
@ -347,6 +365,7 @@ bool A_extension::Exec_A_AMOMAXU() const {
} }
mem_intf->writeDataMem(mem_addr, aux, 4); mem_intf->writeDataMem(mem_addr, aux, 4);
perf->dataMemoryWrite();
log->SC_log(Log::INFO) << std::dec << "AMOMAXU " << std::endl; log->SC_log(Log::INFO) << std::dec << "AMOMAXU " << std::endl;

9
src/BASE_ISA.cpp
View File

@ -328,6 +328,7 @@ bool BASE_ISA::Exec_LB() const {
mem_addr = imm + regs->getValue(rs1); mem_addr = imm + regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 1); data = mem_intf->readDataMem(mem_addr, 1);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
@ -350,6 +351,7 @@ bool BASE_ISA::Exec_LH() const {
mem_addr = imm + regs->getValue(rs1); mem_addr = imm + regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 2); data = mem_intf->readDataMem(mem_addr, 2);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
@ -372,6 +374,7 @@ bool BASE_ISA::Exec_LW() const {
mem_addr = imm + regs->getValue(rs1); mem_addr = imm + regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
@ -395,6 +398,7 @@ bool BASE_ISA::Exec_LBU() const {
mem_addr = imm + regs->getValue(rs1); mem_addr = imm + regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 1); data = mem_intf->readDataMem(mem_addr, 1);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
@ -416,6 +420,8 @@ bool BASE_ISA::Exec_LHU() const {
mem_addr = imm + regs->getValue(rs1); mem_addr = imm + regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 2); data = mem_intf->readDataMem(mem_addr, 2);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
@ -441,6 +447,7 @@ bool BASE_ISA::Exec_SB() const {
data = regs->getValue(rs2); data = regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 1); mem_intf->writeDataMem(mem_addr, data, 1);
perf->dataMemoryWrite();
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
log->SC_log(Log::INFO) << "SB: x" << std::dec << rs2 << " -> x" << rs1 log->SC_log(Log::INFO) << "SB: x" << std::dec << rs2 << " -> x" << rs1
@ -465,6 +472,7 @@ bool BASE_ISA::Exec_SH() const {
data = regs->getValue(rs2); data = regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 2); mem_intf->writeDataMem(mem_addr, data, 2);
perf->dataMemoryWrite();
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
log->SC_log(Log::INFO) << "SH: x" << std::dec << rs2 << " -> x" << rs1 log->SC_log(Log::INFO) << "SH: x" << std::dec << rs2 << " -> x" << rs1
@ -489,6 +497,7 @@ bool BASE_ISA::Exec_SW() const {
data = regs->getValue(rs2); data = regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
log->SC_log(Log::INFO) << "SW: x" << std::dec << rs2 << "(0x" << std::hex log->SC_log(Log::INFO) << "SW: x" << std::dec << rs2 << "(0x" << std::hex

5
src/C_extension.cpp
View File

@ -218,7 +218,7 @@ bool C_extension::Exec_C_LWSP() {
mem_addr = imm + regs->getValue(rs1); mem_addr = imm + regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
@ -302,6 +302,7 @@ bool C_extension::Exec_C_SWSP() {
data = regs->getValue(rs2); data = regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
log->SC_log(Log::INFO) << std::dec << "C.SWSP: x" << rs2 << "(0x" log->SC_log(Log::INFO) << std::dec << "C.SWSP: x" << rs2 << "(0x"
@ -603,6 +604,7 @@ bool C_extension::Exec_C_LW() {
mem_addr = imm + regs->getValue(rs1); mem_addr = imm + regs->getValue(rs1);
data = mem_intf->readDataMem(mem_addr, 4); data = mem_intf->readDataMem(mem_addr, 4);
perf->dataMemoryRead();
regs->setValue(rd, data); regs->setValue(rd, data);
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
@ -629,6 +631,7 @@ bool C_extension::Exec_C_SW() {
data = regs->getValue(rs2); data = regs->getValue(rs2);
mem_intf->writeDataMem(mem_addr, data, 4); mem_intf->writeDataMem(mem_addr, data, 4);
perf->dataMemoryWrite();
if (log->getLogLevel() >= Log::INFO) { if (log->getLogLevel() >= Log::INFO) {
log->SC_log(Log::INFO) << "C.SW: x" << std::dec << rs2 << "(0x" << std::hex log->SC_log(Log::INFO) << "C.SW: x" << std::dec << rs2 << "(0x" << std::hex