Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions test/arch_spec/arch_spec_example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ cgra_defaults:
columns: 4
ctrl_mem_items: 20
base_topology: "mesh"

memory:
banks: 4

tile_defaults:
num_registers: 128
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "mem", "return", "mem_indexed", "alloca", "shift"] # comprehensive function unit types
# Default tiles do not assume a dedicated memory unit. Memory-capable tiles
# are declared explicitly in `tile_overrides`.
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift"]

link_defaults:
latency: 1
Expand Down Expand Up @@ -50,6 +53,12 @@ link_overrides:
bandwidth: 32
existence: true

# Basic method: explicitly list the tiles on the memory-connected side and give
# them an overridden FU list that includes the mem unit. This is the concrete
# configuration used for simulation / Verilog comparison.
#
# Example below: for CGRA (0,0), the West side is attached to off-chip memory,
# so all tiles with tile_x = 0 are explicitly made memory-capable.
tile_overrides:
- cgra_x: 0
cgra_y: 0
Expand All @@ -61,9 +70,9 @@ tile_overrides:

- cgra_x: 1
cgra_y: 0
tile_x: 3
tile_x: 0
tile_y: 0
fu_types: ["mem", "mem_indexed"]
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

Expand Down
59 changes: 58 additions & 1 deletion test/arch_spec/architecture.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ per_cgra_defaults:

tile_defaults:
num_registers: 32
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "mem", "return", "mem_indexed", "alloca", "shift"]
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift"]

link_defaults:
latency: 1
Expand All @@ -24,6 +24,63 @@ link_defaults:
link_overrides:

tile_overrides:
# Enable memory FU only on the 7 boundary tiles:
# left column (0,0)..(0,3) and top/bottom row continuation (1,0)..(3,0).
- cgra_x: 0
cgra_y: 0
tile_x: 0
tile_y: 0
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

- cgra_x: 0
cgra_y: 0
tile_x: 0
tile_y: 1
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

- cgra_x: 0
cgra_y: 0
tile_x: 0
tile_y: 2
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

- cgra_x: 0
cgra_y: 0
tile_x: 0
tile_y: 3
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

- cgra_x: 0
cgra_y: 0
tile_x: 1
tile_y: 0
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

- cgra_x: 0
cgra_y: 0
tile_x: 2
tile_y: 0
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

- cgra_x: 0
cgra_y: 0
tile_x: 3
tile_y: 0
fu_types: ["add", "mul", "div", "fadd", "fmul", "fdiv", "logic", "cmp", "sel", "type_conv", "vfmul", "fadd_fadd", "fmul_fadd", "grant", "loop_control", "phi", "constant", "return", "alloca", "shift", "mem", "mem_indexed"]
num_registers: 32
existence: true

extensions:
crossbar: false
Expand Down
Loading
Loading