Skip to content

Commit

Permalink
Add support for ZCU102
Browse files Browse the repository at this point in the history
  • Loading branch information
Amir Kiamarzi [email protected] committed Dec 23, 2024
1 parent e68707b commit 3f67a48
Show file tree
Hide file tree
Showing 9 changed files with 97 additions and 24 deletions.
6 changes: 3 additions & 3 deletions hw/carfield_pkg.sv
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ localparam cheshire_cfg_t CarfieldCfgDefault = '{
// [0x7000_0000, 0x8000_0000) is CIE
Cva6ExtCieOnTop : 1,
// Harts
NumCores : 2,
NumCores : 1,
CoreMaxTxns : 8,
CoreMaxTxnsPerId : 4,
CoreUserAmoOffs : 0, // Convention: lower AMO bits for cores, MSB for serial link
Expand Down Expand Up @@ -572,8 +572,8 @@ localparam cheshire_cfg_t CarfieldCfgDefault = '{
// Features
Bootrom : 1,
Uart : 1,
I2c : 1,
SpiHost : 1,
I2c : 0,
SpiHost : 0,
Gpio : 1,
Dma : 1,
SerialLink : 1,
Expand Down
12 changes: 12 additions & 0 deletions target/sim/vsim/logs/trace_hart_00010.dasm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
557020ns x 3 0x00001000 DASM(00000317) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x0, 'rd': 0x6, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1004, 'opa': 0x0, 'opb': 0x1000, 'opa_select': 0x3, 'opb_select': 0x7, 'write_rd': 0x1, 'csr_addr': 0x0, 'writeback': 0x1000, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x0, 'retire_load': 0x0, 'alu_result': 0x1000, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557180ns x 3 0x00001004 DASM(07832303) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x6, 'rs2': 0x18, 'rd': 0x6, 'is_load': 0x1, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1008, 'opa': 0x1000, 'opb': 0x78, 'opa_select': 0x1, 'opb_select': 0x2, 'write_rd': 0x0, 'csr_addr': 0x78, 'writeback': 0x1078, 'gpr_rdata_1': 0x0, 'ls_size': 0x2, 'ld_result_32': 0x0, 'lsu_rd': 0x0, 'retire_load': 0x0, 'alu_result': 0x1078, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557400ns x 3 0x00001008 DASM(30531073) #; {'source': 0x0, 'stall': 0x1, 'exception': 0x0, 'rs1': 0x6, 'rs2': 0x5, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1008, 'opa': 0x1000, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x305, 'writeback': 0x1000, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1044, 'lsu_rd': 0x6, 'retire_load': 0x1, 'alu_result': 0x1000, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557540ns x 3 0x00001008 DASM(30531073) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x6, 'rs2': 0x5, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x100c, 'opa': 0x1044, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x305, 'writeback': 0x1044, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x1044, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557740ns x 3 0x0000100c DASM(f1402573) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x14, 'rd': 0xa, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1010, 'opa': 0x0, 'opb': 0x10, 'opa_select': 0x1, 'opb_select': 0x8, 'write_rd': 0x1, 'csr_addr': 0xf14, 'writeback': 0x10, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x10, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557900ns x 3 0x00001010 DASM(00000597) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x0, 'rd': 0xb, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1014, 'opa': 0x0, 'opb': 0x1010, 'opa_select': 0x3, 'opb_select': 0x7, 'write_rd': 0x1, 'csr_addr': 0x0, 'writeback': 0x1010, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x1010, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558060ns x 3 0x00001014 DASM(06c5a583) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0xb, 'rs2': 0xc, 'rd': 0xb, 'is_load': 0x1, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1018, 'opa': 0x1010, 'opb': 0x6c, 'opa_select': 0x1, 'opb_select': 0x2, 'write_rd': 0x0, 'csr_addr': 0x6c, 'writeback': 0x107c, 'gpr_rdata_1': 0x0, 'ls_size': 0x2, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x107c, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558220ns x 3 0x00001018 DASM(30402673) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x4, 'rd': 0xc, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x101c, 'opa': 0x0, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x8, 'write_rd': 0x1, 'csr_addr': 0x304, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x0, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558280ns x 3 0x0000101c DASM(30402673) #; {'source': 0x0, 'stall': 0x1, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x4, 'rd': 0xc, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x101c, 'opa': 0x0, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x8, 'write_rd': 0x1, 'csr_addr': 0x304, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x1, 'alu_result': 0x0, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558420ns x 3 0x0000101c DASM(00866613) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0xc, 'rs2': 0x8, 'rd': 0xc, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1020, 'opa': 0x0, 'opb': 0x8, 'opa_select': 0x1, 'opb_select': 0x2, 'write_rd': 0x1, 'csr_addr': 0x8, 'writeback': 0x8, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x8, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558620ns x 3 0x00001020 DASM(30461073) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0xc, 'rs2': 0x4, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1024, 'opa': 0x8, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x304, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x8, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558780ns x 3 0x00001024 DASM(10500073) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x5, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1028, 'opa': 0x0, 'opb': 0x0, 'opa_select': 0x0, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x105, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x0, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
12 changes: 12 additions & 0 deletions target/sim/vsim/logs/trace_hart_00011.dasm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
557100ns x 3 0x00001000 DASM(00000317) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x0, 'rd': 0x6, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1004, 'opa': 0x0, 'opb': 0x1000, 'opa_select': 0x3, 'opb_select': 0x7, 'write_rd': 0x1, 'csr_addr': 0x0, 'writeback': 0x1000, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x0, 'retire_load': 0x0, 'alu_result': 0x1000, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557260ns x 3 0x00001004 DASM(07832303) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x6, 'rs2': 0x18, 'rd': 0x6, 'is_load': 0x1, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1008, 'opa': 0x1000, 'opb': 0x78, 'opa_select': 0x1, 'opb_select': 0x2, 'write_rd': 0x0, 'csr_addr': 0x78, 'writeback': 0x1078, 'gpr_rdata_1': 0x0, 'ls_size': 0x2, 'ld_result_32': 0x0, 'lsu_rd': 0x0, 'retire_load': 0x0, 'alu_result': 0x1078, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557600ns x 3 0x00001008 DASM(30531073) #; {'source': 0x0, 'stall': 0x1, 'exception': 0x0, 'rs1': 0x6, 'rs2': 0x5, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1008, 'opa': 0x1000, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x305, 'writeback': 0x1000, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1044, 'lsu_rd': 0x6, 'retire_load': 0x1, 'alu_result': 0x1000, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557660ns x 3 0x00001008 DASM(30531073) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x6, 'rs2': 0x5, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x100c, 'opa': 0x1044, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x305, 'writeback': 0x1044, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x1044, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557820ns x 3 0x0000100c DASM(f1402573) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x14, 'rd': 0xa, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1010, 'opa': 0x0, 'opb': 0x11, 'opa_select': 0x1, 'opb_select': 0x8, 'write_rd': 0x1, 'csr_addr': 0xf14, 'writeback': 0x11, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x11, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
557980ns x 3 0x00001010 DASM(00000597) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x0, 'rd': 0xb, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1014, 'opa': 0x0, 'opb': 0x1010, 'opa_select': 0x3, 'opb_select': 0x7, 'write_rd': 0x1, 'csr_addr': 0x0, 'writeback': 0x1010, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x1010, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558140ns x 3 0x00001014 DASM(06c5a583) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0xb, 'rs2': 0xc, 'rd': 0xb, 'is_load': 0x1, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1018, 'opa': 0x1010, 'opb': 0x6c, 'opa_select': 0x1, 'opb_select': 0x2, 'write_rd': 0x0, 'csr_addr': 0x6c, 'writeback': 0x107c, 'gpr_rdata_1': 0x0, 'ls_size': 0x2, 'ld_result_32': 0x0, 'lsu_rd': 0x6, 'retire_load': 0x0, 'alu_result': 0x107c, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558340ns x 3 0x00001018 DASM(30402673) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x4, 'rd': 0xc, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x101c, 'opa': 0x0, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x8, 'write_rd': 0x1, 'csr_addr': 0x304, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x0, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x0, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558480ns x 3 0x0000101c DASM(30402673) #; {'source': 0x0, 'stall': 0x1, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x4, 'rd': 0xc, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x101c, 'opa': 0x0, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x8, 'write_rd': 0x1, 'csr_addr': 0x304, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x1, 'alu_result': 0x0, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558540ns x 3 0x0000101c DASM(00866613) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0xc, 'rs2': 0x8, 'rd': 0xc, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1020, 'opa': 0x0, 'opb': 0x8, 'opa_select': 0x1, 'opb_select': 0x2, 'write_rd': 0x1, 'csr_addr': 0x8, 'writeback': 0x8, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x8, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558700ns x 3 0x00001020 DASM(30461073) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0xc, 'rs2': 0x4, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1024, 'opa': 0x8, 'opb': 0x0, 'opa_select': 0x1, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x304, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x8, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
558860ns x 3 0x00001024 DASM(10500073) #; {'source': 0x0, 'stall': 0x0, 'exception': 0x0, 'rs1': 0x0, 'rs2': 0x5, 'rd': 0x0, 'is_load': 0x0, 'is_store': 0x0, 'is_branch': 0x0, 'pc_d': 0x1028, 'opa': 0x0, 'opb': 0x0, 'opa_select': 0x0, 'opb_select': 0x0, 'write_rd': 0x1, 'csr_addr': 0x105, 'writeback': 0x0, 'gpr_rdata_1': 0x0, 'ls_size': 0x0, 'ld_result_32': 0x1048, 'lsu_rd': 0xb, 'retire_load': 0x0, 'alu_result': 0x0, 'ls_amo': 0x0, 'retire_acc': 0x0, 'acc_pid': 0x0, 'acc_pdata_32': 0x0, 'fpu_offload': 0x0, 'is_seq_insn': 0x0, }
Empty file added target/sim/vsim/uart
Empty file.
Loading

0 comments on commit 3f67a48

Please sign in to comment.