github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-06-28 09:17:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace cluster_id/core_id with hart_id (#29)

Browse source 
If you're migrating from the previous interface you can use

logic [31:0] hart_id;
assign hart_id = {21'b0, cluster_id_i[5:0], 1'b0, core_id_i[3:0]};

...

ibex_core #(
  ...
) u_core (
  ...

  // replace core_id_i and cluster_id_i
  .hart_id_i(hart_id),

  ...
);
This commit is contained in:
Greg Chadwick 2019-09-03 10:46:23 +01:00
parent 9b51b1143a
commit d14312c3cc
11 changed files with 22 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/integration.rst
View file

@ -28,8 +28,7 @@ Instantiation Template
.test_en_i (), .test_en_i (),
// Configuration // Configuration
.core_id_i (), .hart_id_i (),
.cluster_id_i (),
.boot_addr_i (), .boot_addr_i (),
// Instruction memory interface // Instruction memory interface
@ -90,7 +89,6 @@ Parameters
| ``DmExceptionAddr`` | int | 0x1A110808 | Address to jump to when an exception occurs while in debug mode | | ``DmExceptionAddr`` | int | 0x1A110808 | Address to jump to when an exception occurs while in debug mode |
+-----------------------+-------------+------------+-----------------------------------------------------------------+ +-----------------------+-------------+------------+-----------------------------------------------------------------+
Interfaces Interfaces
---------- ----------
@ -103,10 +101,8 @@ Interfaces
+-------------------------+-------------------------+-----+----------------------------------------+ +-------------------------+-------------------------+-----+----------------------------------------+
| ``test_en_i`` | 1 | in | Test input, enables clock | | ``test_en_i`` | 1 | in | Test input, enables clock |
+-------------------------+-------------------------+-----+----------------------------------------+ +-------------------------+-------------------------+-----+----------------------------------------+
| ``core_id_i`` | 4 | in | Core ID, usually static, can be read | | ``hart_id_i`` | 32 | in | Hart ID, usually static, can be read |
| | | | from :ref:`csr-mhartid` CSR | | | | | from :ref:`csr-mhartid` CSR |
+-------------------------+-------------------------+-----+ +
| ``cluster_id_i`` | 6 | in | |
+-------------------------+-------------------------+-----+----------------------------------------+ +-------------------------+-------------------------+-----+----------------------------------------+
| ``boot_addr_i`` | 32 | in | First program counter after reset | | ``boot_addr_i`` | 32 | in | First program counter after reset |
| | | | = ``boot_addr_i`` + 0x80, | | | | | = ``boot_addr_i`` + 0x80, |

3
dv/riscv_compliance/rtl/ibex_riscv_compliance.sv
View file

@ -110,8 +110,7 @@ module ibex_riscv_compliance (
.test_en_i ('b0), .test_en_i ('b0),
.core_id_i (4'b0), .hart_id_i (32'b0),
.cluster_id_i (6'b0),
// First instruction executed is at 0x0 + 0x80 // First instruction executed is at 0x0 + 0x80
.boot_addr_i (32'h00000000), .boot_addr_i (32'h00000000),

3
dv/uvm/tb/core_ibex_tb_top.sv
View file

@ -23,8 +23,7 @@ module core_ibex_tb_top;
.clk_i(clk), .clk_i(clk),
.rst_ni(rst_n), .rst_ni(rst_n),
.test_en_i(1'b1), .test_en_i(1'b1),
.core_id_i('0), .hart_id_i(32'b0),
.cluster_id_i('0),
.boot_addr_i(`BOOT_ADDR), // align with spike boot address .boot_addr_i(`BOOT_ADDR), // align with spike boot address
.debug_req_i(debug_req), .debug_req_i(debug_req),
.irq_software_i(irq_if.irq_software), .irq_software_i(irq_if.irq_software),

3
examples/fpga/artya7-100/rtl/top_artya7_100.sv
View file

@ -48,8 +48,7 @@ module top_artya7_100 (
.test_en_i ('b0), .test_en_i ('b0),
.core_id_i (4'b0), .hart_id_i (32'b0),
.cluster_id_i (6'b0),
// First instruction executed is at 0x0 + 0x80 // First instruction executed is at 0x0 + 0x80
.boot_addr_i (32'h00000000), .boot_addr_i (32'h00000000),

3
examples/sim/tb/ibex_tracing_tb.sv
View file

@ -77,8 +77,7 @@ module ibex_tracing_tb;
.test_en_i (1'b0), .test_en_i (1'b0),
// Core ID, Cluster ID and boot address are considered more or less static // Core ID, Cluster ID and boot address are considered more or less static
.core_id_i (4'b0), .hart_id_i (32'b0),
.cluster_id_i (6'b0),
.boot_addr_i (32'b0), .boot_addr_i (32'b0),
// Instruction memory interface // Instruction memory interface

8
lint/verilator_waiver.vlt
View file

@ -56,15 +56,15 @@ lint_off -msg UNUSED -file "*/rtl/ibex_pmp.sv" -lines 16
// Signal is not used: csr_pmp_addr // Signal is not used: csr_pmp_addr
// Signal not connected when PMP is not configured // Signal not connected when PMP is not configured
lint_off -msg UNUSED -file "*/rtl/ibex_core.sv" -lines 188 lint_off -msg UNUSED -file "*/rtl/ibex_core.sv" -lines 186
// Signal is not used: csr_pmp_cfg // Signal is not used: csr_pmp_cfg
// Signal not connected when PMP is not configured // Signal not connected when PMP is not configured
lint_off -msg UNUSED -file "*/rtl/ibex_core.sv" -lines 189 lint_off -msg UNUSED -file "*/rtl/ibex_core.sv" -lines 187
// Signal is not used: priv_mode // Signal is not used: priv_mode
// Signal not connected when PMP is not configured // Signal not connected when PMP is not configured
lint_off -msg UNUSED -file "*/rtl/ibex_core.sv" -lines 201 lint_off -msg UNUSED -file "*/rtl/ibex_core.sv" -lines 199
// Signal unoptimizable: Feedback to clock or circular logic: // Signal unoptimizable: Feedback to clock or circular logic:
// ibex_core.id_stage_i.controller_i.ctrl_fsm_cs // ibex_core.id_stage_i.controller_i.ctrl_fsm_cs
@ -74,4 +74,4 @@ lint_off -msg UNOPTFLAT -file "*/rtl/ibex_controller.sv" -lines 98
// Signal unoptimizable: Feedback to clock or circular logic: // Signal unoptimizable: Feedback to clock or circular logic:
// ibex_core.cs_registers_i.mie_q // ibex_core.cs_registers_i.mie_q
// Issue lowrisc/ibex#212 // Issue lowrisc/ibex#212
lint_off -msg UNOPTFLAT -file "*/rtl/ibex_cs_registers.sv" -lines 150 lint_off -msg UNOPTFLAT -file "*/rtl/ibex_cs_registers.sv" -lines 149

2
rtl/ibex_controller.sv
View file

@ -123,7 +123,7 @@ module ibex_controller (
always_ff @(negedge clk_i) begin always_ff @(negedge clk_i) begin
// print warning in case of decoding errors // print warning in case of decoding errors
if ((ctrl_fsm_cs == DECODE) && instr_valid_i && illegal_insn) begin if ((ctrl_fsm_cs == DECODE) && instr_valid_i && illegal_insn) begin
$display("%t: Illegal instruction (core %0d) at PC 0x%h: 0x%h", $time, ibex_core.core_id_i, $display("%t: Illegal instruction (hart %0x) at PC 0x%h: 0x%h", $time, ibex_core.hart_id_i,
ibex_id_stage.pc_id_i, ibex_id_stage.instr_rdata_i); ibex_id_stage.pc_id_i, ibex_id_stage.instr_rdata_i);
end end
end end

9
rtl/ibex_core.sv
View file

@ -27,9 +27,7 @@ module ibex_core #(
input logic test_en_i, // enable all clock gates for testing input logic test_en_i, // enable all clock gates for testing
// Core ID, Cluster ID and boot address are considered more or less static input logic [31:0] hart_id_i,
input logic [ 3:0] core_id_i,
input logic [ 5:0] cluster_id_i,
input logic [31:0] boot_addr_i, input logic [31:0] boot_addr_i,
// Instruction memory interface // Instruction memory interface
@ -566,9 +564,8 @@ module ibex_core #(
.clk_i ( clk ), .clk_i ( clk ),
.rst_ni ( rst_ni ), .rst_ni ( rst_ni ),
// Core and Cluster ID from outside // Hart ID from outside
.core_id_i ( core_id_i ), .hart_id_i ( hart_id_i ),
.cluster_id_i ( cluster_id_i ),
.priv_mode_o ( priv_mode ), .priv_mode_o ( priv_mode ),
// mtvec // mtvec

10
rtl/ibex_core_tracing.sv
View file

@ -20,9 +20,7 @@ module ibex_core_tracing #(
input logic test_en_i, // enable all clock gates for testing input logic test_en_i, // enable all clock gates for testing
// Core ID, Cluster ID and boot address are considered more or less static input logic [31:0] hart_id_i,
input logic [ 3:0] core_id_i,
input logic [ 5:0] cluster_id_i,
input logic [31:0] boot_addr_i, input logic [31:0] boot_addr_i,
// Instruction memory interface // Instruction memory interface
@ -101,8 +99,7 @@ module ibex_core_tracing #(
.test_en_i, .test_en_i,
.core_id_i, .hart_id_i,
.cluster_id_i,
.boot_addr_i, .boot_addr_i,
.instr_req_o, .instr_req_o,
@ -162,8 +159,7 @@ module ibex_core_tracing #(
.rst_ni ( rst_ni ), .rst_ni ( rst_ni ),
.fetch_enable_i ( fetch_enable_i ), .fetch_enable_i ( fetch_enable_i ),
.core_id_i ( core_id_i ), .hart_id_i ( hart_id_i ),
.cluster_id_i ( cluster_id_i ),
.valid_i ( rvfi_valid ), .valid_i ( rvfi_valid ),
.pc_i ( rvfi_pc_rdata ), .pc_i ( rvfi_pc_rdata ),

7
rtl/ibex_cs_registers.sv
View file

@ -22,9 +22,8 @@ module ibex_cs_registers #(
input logic clk_i, input logic clk_i,
input logic rst_ni, input logic rst_ni,
// Core and Cluster ID // Hart ID
input logic [3:0] core_id_i, input logic [31:0] hart_id_i,
input logic [5:0] cluster_id_i,
output ibex_pkg::priv_lvl_e priv_mode_o, output ibex_pkg::priv_lvl_e priv_mode_o,
// mtvec // mtvec
@ -222,7 +221,7 @@ module ibex_cs_registers #(
unique case (csr_addr_i) unique case (csr_addr_i)
// mhartid: unique hardware thread id // mhartid: unique hardware thread id
CSR_MHARTID: csr_rdata_int = {21'b0, cluster_id_i[5:0], 1'b0, core_id_i[3:0]}; CSR_MHARTID: csr_rdata_int = hart_id_i;
// mstatus: always M-mode, contains IE bit // mstatus: always M-mode, contains IE bit
CSR_MSTATUS: begin CSR_MSTATUS: begin

5
rtl/ibex_tracer.sv
View file

@ -23,8 +23,7 @@ module ibex_tracer #(
input logic rst_ni, input logic rst_ni,
input logic fetch_enable_i, input logic fetch_enable_i,
input logic [3:0] core_id_i, input logic [31:0] hart_id_i,
input logic [5:0] cluster_id_i,
input logic valid_i, input logic valid_i,
input logic [31:0] pc_i, input logic [31:0] pc_i,
@ -290,7 +289,7 @@ module ibex_tracer #(
initial begin initial begin
wait(rst_ni == 1'b1); wait(rst_ni == 1'b1);
wait(fetch_enable_i == 1'b1); wait(fetch_enable_i == 1'b1);
$sformat(fn, "trace_core_%h_%h.log", cluster_id_i, core_id_i); $sformat(fn, "trace_core_%h.log", hart_id_i);
$display("[TRACER] Output filename is: %s", fn); $display("[TRACER] Output filename is: %s", fn);
f = $fopen(fn, "w"); f = $fopen(fn, "w");
$fwrite(f, " Time Cycles PC Instr Mnemonic\n"); $fwrite(f, " Time Cycles PC Instr Mnemonic\n");