Skip to content

Commit

Permalink
cfg: Make JSON5 compliant
Browse files Browse the repository at this point in the history
  • Loading branch information
@colluca
colluca committed Oct 3, 2024
1 parent 2207a45 commit 7aab923
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
34 changes: 17 additions & 17 deletions target/sim/cfg/full.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@
periph_axi_lite_narrow_plic_cfg: 1,
periph_axi_lite_narrow_spim_cfg: 1,
periph_axi_lite_narrow_timer_cfg: 1,
}
},
txns: {
wide_and_inter: 128,
wide_to_hbm: 128,
narrow_and_wide: 16,
rmq: 4,
}
},
narrow_xbar_slv_id_width: 4,
narrow_xbar_user_width: 5, // clog2(total number of clusters)
nr_s1_quadrant: 6,
Expand All @@ -98,23 +98,23 @@
sets: 2,
max_trans: 32,
address_regions: 4,
}
},
narrow_tlb_cfg: {
max_trans: 32,
l1_num_entries: 8,
l1_cut_ax: true,
}
},
wide_tlb_cfg: {
max_trans: 32,
l1_num_entries: 8,
l1_cut_ax: true,
}
},
wide_xbar: {
max_slv_trans: 32,
max_mst_trans: 32,
fall_through: false,
},
wide_xbar_slv_id_width: 3
wide_xbar_slv_id_width: 3,
narrow_xbar: {
max_slv_trans: 8,
max_mst_trans: 8,
Expand All @@ -126,10 +126,10 @@
cfg_base_offset: 65536 // 0x10000
},
cluster: {
name: "occamy_cluster"
name: "occamy_cluster",
boot_addr: 4096, // 0x1000
cluster_base_addr: 268435456, // 0x10000000
cluster_base_offset: 262144 // 0x40000
cluster_base_offset: 262144, // 0x40000
cluster_base_hartid: 1,
addr_width: 48,
data_width: 64,
Expand Down Expand Up @@ -168,7 +168,7 @@
lat_noncomp: 1,
lat_conv: 2,
lat_sdotp: 3,
fpu_pipe_config: "BEFORE"
fpu_pipe_config: "BEFORE",
narrow_xbar_latency: "CUT_ALL_PORTS",
wide_xbar_latency: "CUT_ALL_PORTS",
// Isolate the core.
Expand Down Expand Up @@ -201,7 +201,7 @@
]
}
],
}
},
// Templates.
compute_core_template: {
isa: "rv32imafd",
Expand Down Expand Up @@ -234,10 +234,10 @@
dma_core_template: {
isa: "rv32imafd",
// Xdiv_sqrt: true,
# isa: "rv32ema",
xdma: true
xssr: false
xfrep: false
// isa: "rv32ema",
xdma: true,
xssr: false,
xfrep: false,
xf16: false,
xf16alt: false,
xf8: false,
Expand All @@ -251,7 +251,7 @@
num_sequencer_instructions: 16,
num_dtlb_entries: 1,
num_itlb_entries: 1,
}
},
// peripherals
peripherals: {
rom: {
Expand Down Expand Up @@ -372,7 +372,7 @@
hbi: {
address: 1099511627776, // 0x100_0000_0000
length: 1099511627776, // 1 TiB 0x100_0000_0000
}
},
hbm: {
address_0: 2147483648, // 0x8000_0000
address_1: 68719476736, // 0x10_0000_0000
Expand All @@ -385,7 +385,7 @@
length: 4194304, // 4 MiB 0x40_0000
},
phy: {
address: 150994944 // 0x0900_0000
address: 150994944, // 0x0900_0000
length: 1048576, // 1 MiB 0x10_0000
},
seq: {
Expand Down
34 changes: 17 additions & 17 deletions target/sim/cfg/single-cluster.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@
periph_axi_lite_narrow_plic_cfg: 1,
periph_axi_lite_narrow_spim_cfg: 1,
periph_axi_lite_narrow_timer_cfg: 1,
}
},
txns: {
wide_and_inter: 128,
wide_to_hbm: 128,
narrow_and_wide: 16,
rmq: 4,
}
},
narrow_xbar_slv_id_width: 4,
narrow_xbar_user_width: 5, // clog2(total number of clusters)
nr_s1_quadrant: 1,
Expand All @@ -98,23 +98,23 @@
sets: 2,
max_trans: 32,
address_regions: 4,
}
},
narrow_tlb_cfg: {
max_trans: 32,
l1_num_entries: 8,
l1_cut_ax: true,
}
},
wide_tlb_cfg: {
max_trans: 32,
l1_num_entries: 8,
l1_cut_ax: true,
}
},
wide_xbar: {
max_slv_trans: 32,
max_mst_trans: 32,
fall_through: false,
},
wide_xbar_slv_id_width: 3
wide_xbar_slv_id_width: 3,
narrow_xbar: {
max_slv_trans: 8,
max_mst_trans: 8,
Expand All @@ -126,10 +126,10 @@
cfg_base_offset: 65536 // 0x10000
},
cluster: {
name: "occamy_cluster"
name: "occamy_cluster",
boot_addr: 4096, // 0x1000
cluster_base_addr: 268435456, // 0x10000000
cluster_base_offset: 262144 // 0x40000
cluster_base_offset: 262144, // 0x40000
cluster_base_hartid: 1,
addr_width: 48,
data_width: 64,
Expand Down Expand Up @@ -168,7 +168,7 @@
lat_noncomp: 1,
lat_conv: 2,
lat_sdotp: 3,
fpu_pipe_config: "BEFORE"
fpu_pipe_config: "BEFORE",
narrow_xbar_latency: "CUT_ALL_PORTS",
wide_xbar_latency: "CUT_ALL_PORTS",
// Isolate the core.
Expand Down Expand Up @@ -201,7 +201,7 @@
]
}
],
}
},
// Templates.
compute_core_template: {
isa: "rv32imafd",
Expand Down Expand Up @@ -234,10 +234,10 @@
dma_core_template: {
isa: "rv32imafd",
// Xdiv_sqrt: true,
# isa: "rv32ema",
xdma: true
xssr: false
xfrep: false
// isa: "rv32ema",
xdma: true,
xssr: false,
xfrep: false,
xf16: false,
xf16alt: false,
xf8: false,
Expand All @@ -251,7 +251,7 @@
num_sequencer_instructions: 16,
num_dtlb_entries: 1,
num_itlb_entries: 1,
}
},
// peripherals
peripherals: {
rom: {
Expand Down Expand Up @@ -372,7 +372,7 @@
hbi: {
address: 1099511627776, // 0x100_0000_0000
length: 1099511627776, // 1 TiB 0x100_0000_0000
}
},
hbm: {
address_0: 2147483648, // 0x8000_0000
address_1: 68719476736, // 0x10_0000_0000
Expand All @@ -385,7 +385,7 @@
length: 4194304, // 4 MiB 0x40_0000
},
phy: {
address: 150994944 // 0x0900_0000
address: 150994944, // 0x0900_0000
length: 1048576, // 1 MiB 0x10_0000
},
seq: {
Expand Down

0 comments on commit 7aab923

Please sign in to comment.