Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in rvvi reset.

Browse Source
This commit is contained in:
Ross Thompson 2024-06-12 14:47:32 -07:00
parent 323dbd348e
commit c9f51df34a
2 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
fpga/rvvidaemon/rvvidaemon.c
View File

@ -93,6 +93,7 @@ typedef struct {
void DecodeRVVI(uint8_t *payload, ssize_t payloadsize, RequiredRVVI_t *InstructionData); void DecodeRVVI(uint8_t *payload, ssize_t payloadsize, RequiredRVVI_t *InstructionData);
void BitShiftArray(uint8_t *dst, uint8_t *src, uint8_t ShiftAmount, int Length); void BitShiftArray(uint8_t *dst, uint8_t *src, uint8_t ShiftAmount, int Length);
void PrintInstructionData(RequiredRVVI_t *InstructionData);
int main(int argc, char **argv){ int main(int argc, char **argv){
@ -139,13 +140,13 @@ int main(int argc, char **argv){
} }
printf("Here 4\n"); printf("Here 4\n");
if(!rvviVersionCheck(RVVI_API_VERSION)){ /* if(!rvviVersionCheck(RVVI_API_VERSION)){ */
printf("Bad RVVI_API_VERSION\n"); /* printf("Bad RVVI_API_VERSION\n"); */
} /* } */
//rvviRefConfigSetString(IDV_CONFIG_MODEL_VENDOR, "riscv.ovpworld.org"); //rvviRefConfigSetString(IDV_CONFIG_MODEL_VENDOR, "riscv.ovpworld.org");
rvviRefInit(NULL); //rvviRefInit(NULL);
while(1) { while(1) {
//printf("listener: Waiting to recvfrom...\n"); //printf("listener: Waiting to recvfrom...\n");
@ -165,6 +166,7 @@ int main(int argc, char **argv){
uint32_t insn; uint32_t insn;
RequiredRVVI_t InstructionData; RequiredRVVI_t InstructionData;
DecodeRVVI(buf + headerbytes, payloadbytes, &InstructionData); DecodeRVVI(buf + headerbytes, payloadbytes, &InstructionData);
PrintInstructionData(&InstructionData);
} }
} }
@ -208,6 +210,7 @@ void DecodeRVVI(uint8_t *payload, ssize_t payloadsize, RequiredRVVI_t *Instructi
uint8_t CSRWen[3] = {0, 0, 0}; uint8_t CSRWen[3] = {0, 0, 0};
uint16_t CSRReg[3]; uint16_t CSRReg[3];
uint64_t CSRValue[3]; uint64_t CSRValue[3];
int CSRIndex;
Trap = RequiredFlags & 0x1; Trap = RequiredFlags & 0x1;
PrivilegeMode = (RequiredFlags >> 1) & 0x3; PrivilegeMode = (RequiredFlags >> 1) & 0x3;
@ -216,22 +219,11 @@ void DecodeRVVI(uint8_t *payload, ssize_t payloadsize, RequiredRVVI_t *Instructi
CSRCount = (RequiredFlags >> 5) & 0xFFF; CSRCount = (RequiredFlags >> 5) & 0xFFF;
payload += 2; payload += 2;
printf("PC = %lx, insn = %x, Mcycle = %lx, Minstret = %lx, Trap = %hhx, PrivilegeMode = %hhx, GPRWen = %hhx, FPRWen = %hhx, CSRCount == %hx\n", PC, insn, Mcycle, Minstret, Trap, PrivilegeMode, GPRWen, FPRWen, CSRCount);
if(GPRWen || FPRWen || (CSRCount != 0)){ if(GPRWen || FPRWen || (CSRCount != 0)){
// the first bit of payload is the last bit of CSRCount. // the first bit of payload is the last bit of CSRCount.
ssize_t newPayloadSize = payloadsize - 30; ssize_t newPayloadSize = payloadsize - 30;
BitShiftArray(buf2, payload, 1, newPayloadSize); BitShiftArray(buf2, payload, 1, newPayloadSize);
int index; int index;
printf("payload = ");
for(index = 0; index < 10; index++){
printf("%02hhx", payload[index]);
}
printf("\n");
printf("buf2 = ");
for(index = 0; index < 10; index++){
printf("%02hhx", buf2[index]);
}
printf("\n");
if(GPRWen){ if(GPRWen){
GPRReg = * (uint8_t *) buf2ptr; GPRReg = * (uint8_t *) buf2ptr;
GPRReg = GPRReg & 0x1F; GPRReg = GPRReg & 0x1F;
@ -250,13 +242,6 @@ void DecodeRVVI(uint8_t *payload, ssize_t payloadsize, RequiredRVVI_t *Instructi
BitShiftArray(buf3, buf2, 5, newPayloadSize); BitShiftArray(buf3, buf2, 5, newPayloadSize);
FPRData = * (uint64_t *) buf3; FPRData = * (uint64_t *) buf3;
} }
printf("Wrote register %d with value = %lx\n", GPRReg, GPRData);
int bits;
printf("Start at Reg data = ");
for(bits = 0; bits < newPayloadSize; bits++){
printf("%02hhX", buf2[bits]);
}
printf("\n");
if(GPRWen ^ FPRWen){ if(GPRWen ^ FPRWen){
payload += 8; payload += 8;
Buf2Size = payloadsize - 38; Buf2Size = payloadsize - 38;
@ -269,7 +254,6 @@ void DecodeRVVI(uint8_t *payload, ssize_t payloadsize, RequiredRVVI_t *Instructi
Buf2Size = payloadsize - 30; Buf2Size = payloadsize - 30;
BitShiftArray(buf2, payload, 1, Buf2Size); BitShiftArray(buf2, payload, 1, Buf2Size);
} }
int CSRIndex;
buf2ptr = buf2; buf2ptr = buf2;
for(CSRIndex = 0; CSRIndex < CSRCount; CSRIndex++){ for(CSRIndex = 0; CSRIndex < CSRCount; CSRIndex++){
CSRReg[CSRIndex] = (*(uint16_t *) buf2ptr) & 0xFFF; CSRReg[CSRIndex] = (*(uint16_t *) buf2ptr) & 0xFFF;
@ -279,48 +263,43 @@ void DecodeRVVI(uint8_t *payload, ssize_t payloadsize, RequiredRVVI_t *Instructi
CSRWen[CSRIndex] = 1; CSRWen[CSRIndex] = 1;
buf2ptr = buf3; buf2ptr = buf3;
} }
for(CSRIndex = 0; CSRIndex < 3; CSRIndex++){
if(CSRWen[CSRIndex]){
printf("Wrote CSR %x with value %lx\n", CSRReg[CSRIndex], CSRValue[CSRIndex]);
}
}
InstructionData->PC = PC;
InstructionData->insn = insn;
InstructionData->Mcycle = Mcycle;
InstructionData->Minstret = Minstret;
InstructionData->Trap = Trap;
InstructionData->PrivilegeMode = PrivilegeMode;
InstructionData->GPREn = GPRWen;
InstructionData->FPREn = FPRWen;
InstructionData->CSRCount = CSRCount;
InstructionData->GPRReg = GPRReg;
InstructionData->GPRValue = GPRData;
InstructionData->FPRReg = FPRReg;
InstructionData->FPRValue = FPRData;
for(CSRIndex = 0; CSRIndex < 3; CSRIndex++){
InstructionData->CSRWen[CSRIndex] = CSRWen[CSRIndex];
InstructionData->CSRReg[CSRIndex] = CSRReg[CSRIndex];
InstructionData->CSRValue[CSRIndex] = CSRValue[CSRIndex];
}
//printf("Wrote reg %d = %lx\n", FirstReg->RegAddress, FirstReg->RegValue);
} }
printf("!!!!!\n\n"); InstructionData->PC = PC;
InstructionData->insn = insn;
InstructionData->Mcycle = Mcycle;
InstructionData->Minstret = Minstret;
InstructionData->Trap = Trap;
InstructionData->PrivilegeMode = PrivilegeMode;
InstructionData->GPREn = GPRWen;
InstructionData->FPREn = FPRWen;
InstructionData->CSRCount = CSRCount;
InstructionData->GPRReg = GPRReg;
InstructionData->GPRValue = GPRData;
InstructionData->FPRReg = FPRReg;
InstructionData->FPRValue = FPRData;
for(CSRIndex = 0; CSRIndex < 3; CSRIndex++){
InstructionData->CSRWen[CSRIndex] = CSRWen[CSRIndex];
InstructionData->CSRReg[CSRIndex] = CSRReg[CSRIndex];
InstructionData->CSRValue[CSRIndex] = CSRValue[CSRIndex];
}
} }
void PrintInstructionData(RequiredRVVI_t *InstructionData){ void PrintInstructionData(RequiredRVVI_t *InstructionData){
int CSRIndex; int CSRIndex;
printf("PC = %lx, insn = %x, Mcycle = %lx, Minstret = %lx, Trap = %hhx, PrivilegeMode = %hhx, GPRWen = %hhx, FPRWen = %hhx, CSRCount == %hx\n", printf("PC = %lx, insn = %x, Mcycle = %lx, Minstret = %lx, Trap = %hhx, PrivilegeMode = %hhx",
InstructionData->PC, InstructionData->insn, InstructionData->Mcycle, InstructionData->Minstret, InstructionData->Trap, InstructionData->PrivilegeMode, InstructionData->GPREn, InstructionData->FPREn, InstructionData->CSRCount); InstructionData->PC, InstructionData->insn, InstructionData->Mcycle, InstructionData->Minstret, InstructionData->Trap, InstructionData->PrivilegeMode);
if(InstructionData->GPREn){ if(InstructionData->GPREn){
printf(", GPR[%d] = %lx", InstructionData->GPRReg, InstructionData->GPRValue);
}
if(InstructionData->FPREn){
printf(", FPR[%d] = %lx", InstructionData->FPRReg, InstructionData->FPRValue);
} }
for(CSRIndex = 0; CSRIndex < 3; CSRIndex++){ for(CSRIndex = 0; CSRIndex < 3; CSRIndex++){
if(InstructionData->CSRWen[CSRIndex]){ if(InstructionData->CSRWen[CSRIndex]){
printf("Wrote CSR %x with value %lx\n", InstructionData->CSRReg[CSRIndex], InstructionData->CSRValue[CSRIndex]); printf(", CSR[%x] = %lx", InstructionData->CSRReg[CSRIndex], InstructionData->CSRValue[CSRIndex]);
} }
} }
printf("\n");
} }
void BitShiftArray(uint8_t *dst, uint8_t *src, uint8_t ShiftAmount, int Length){ void BitShiftArray(uint8_t *dst, uint8_t *src, uint8_t ShiftAmount, int Length){

2
fpga/src/fpgaTopArtyA7.sv
View File

@ -1134,7 +1134,7 @@ module fpgaTop
packetizer #(P, MAX_CSRS) packetizer(.rvvi, .valid, .m_axi_aclk(CPUCLK), .m_axi_aresetn(~bus_struct_reset), .RVVIStall, packetizer #(P, MAX_CSRS) packetizer(.rvvi, .valid, .m_axi_aclk(CPUCLK), .m_axi_aresetn(~bus_struct_reset), .RVVIStall,
.RvviAxiWdata, .RvviAxiWstrb, .RvviAxiWlast, .RvviAxiWvalid, .RvviAxiWready); .RvviAxiWdata, .RvviAxiWstrb, .RvviAxiWlast, .RvviAxiWvalid, .RvviAxiWready);
eth_mac_mii_fifo #("GENERIC", "BUFG", 32) ethernet(.rst(reset), .logic_clk(CPUCLK), .logic_rst(bus_struct_reset), eth_mac_mii_fifo #("GENERIC", "BUFG", 32) ethernet(.rst(bus_struct_reset), .logic_clk(CPUCLK), .logic_rst(bus_struct_reset),
.tx_axis_tdata(RvviAxiWdata), .tx_axis_tkeep(RvviAxiWstrb), .tx_axis_tvalid(RvviAxiWvalid), .tx_axis_tready(RvviAxiWready), .tx_axis_tdata(RvviAxiWdata), .tx_axis_tkeep(RvviAxiWstrb), .tx_axis_tvalid(RvviAxiWvalid), .tx_axis_tready(RvviAxiWready),
.tx_axis_tlast(RvviAxiWlast), .tx_axis_tuser('0), .rx_axis_tdata(), .rx_axis_tkeep(), .rx_axis_tvalid(), .rx_axis_tready(1'b1), .tx_axis_tlast(RvviAxiWlast), .tx_axis_tuser('0), .rx_axis_tdata(), .rx_axis_tkeep(), .rx_axis_tvalid(), .rx_axis_tready(1'b1),
.rx_axis_tlast(), .rx_axis_tuser(), .rx_axis_tlast(), .rx_axis_tuser(),