rtl/gfx: rename platform/wavelet3d -> rtl/gfx

37 files changed, 21 insertions, 1 deletions

diff --git a/platform/wavelet3d/gfx_axib.sv b/rtl/gfx/gfx_axib.sv
index 7b3cbdc..7b3cbdc 100644
--- a/platform/wavelet3d/gfx_axib.sv
+++ b/rtl/gfx/gfx_axib.sv
diff --git a/platform/wavelet3d/gfx_axil.sv b/rtl/gfx/gfx_axil.sv
index c254e26..c254e26 100644
--- a/platform/wavelet3d/gfx_axil.sv
+++ b/rtl/gfx/gfx_axil.sv
diff --git a/platform/wavelet3d/gfx_axil2regblock.sv b/rtl/gfx/gfx_axil2regblock.sv
index 2449b05..2449b05 100644
--- a/platform/wavelet3d/gfx_axil2regblock.sv
+++ b/rtl/gfx/gfx_axil2regblock.sv
diff --git a/platform/wavelet3d/gfx_beats.sv b/rtl/gfx/gfx_beats.sv
index fcbb091..fcbb091 100644
--- a/platform/wavelet3d/gfx_beats.sv
+++ b/rtl/gfx/gfx_beats.sv
diff --git a/platform/wavelet3d/gfx_bootrom.sv b/rtl/gfx/gfx_bootrom.sv
index 2c4581e..2c4581e 100644
--- a/platform/wavelet3d/gfx_bootrom.sv
+++ b/rtl/gfx/gfx_bootrom.sv
diff --git a/platform/wavelet3d/gfx_clz.sv b/rtl/gfx/gfx_clz.sv
index 8d6f100..8d6f100 100644
--- a/platform/wavelet3d/gfx_clz.sv
+++ b/rtl/gfx/gfx_clz.sv
diff --git a/platform/wavelet3d/gfx_ctz.sv b/rtl/gfx/gfx_ctz.sv
index 2713f8a..2713f8a 100644
--- a/platform/wavelet3d/gfx_ctz.sv
+++ b/rtl/gfx/gfx_ctz.sv
diff --git a/platform/wavelet3d/gfx_fifo.sv b/rtl/gfx/gfx_fifo.sv
index 7174e4d..7174e4d 100644
--- a/platform/wavelet3d/gfx_fifo.sv
+++ b/rtl/gfx/gfx_fifo.sv
diff --git a/platform/wavelet3d/gfx_fixed_dotadd.sv b/rtl/gfx/gfx_fixed_dotadd.sv
index fdd5ffd..fdd5ffd 100644
--- a/platform/wavelet3d/gfx_fixed_dotadd.sv
+++ b/rtl/gfx/gfx_fixed_dotadd.sv
diff --git a/platform/wavelet3d/gfx_fixed_muladd.sv b/rtl/gfx/gfx_fixed_muladd.sv
index 22b7247..22b7247 100644
--- a/platform/wavelet3d/gfx_fixed_muladd.sv
+++ b/rtl/gfx/gfx_fixed_muladd.sv
diff --git a/platform/wavelet3d/gfx_front_back.sv b/rtl/gfx/gfx_front_back.sv
index b768532..b768532 100644
--- a/platform/wavelet3d/gfx_front_back.sv
+++ b/rtl/gfx/gfx_front_back.sv
diff --git a/platform/wavelet3d/gfx_isa.sv b/rtl/gfx/gfx_isa.sv
index 7239478..7239478 100644
--- a/platform/wavelet3d/gfx_isa.sv
+++ b/rtl/gfx/gfx_isa.sv
diff --git a/platform/wavelet3d/gfx_pipes.sv b/rtl/gfx/gfx_pipes.sv
index 2fa875a..2fa875a 100644
--- a/platform/wavelet3d/gfx_pipes.sv
+++ b/rtl/gfx/gfx_pipes.sv
diff --git a/platform/wavelet3d/gfx_pkg.sv b/rtl/gfx/gfx_pkg.sv
index 7072967..7072967 100644
--- a/platform/wavelet3d/gfx_pkg.sv
+++ b/rtl/gfx/gfx_pkg.sv
diff --git a/platform/wavelet3d/gfx_pkts.sv b/rtl/gfx/gfx_pkts.sv
index 41399ce..41399ce 100644
--- a/platform/wavelet3d/gfx_pkts.sv
+++ b/rtl/gfx/gfx_pkts.sv
diff --git a/platform/wavelet3d/gfx_raster.sv b/rtl/gfx/gfx_raster.sv
index a57a672..a57a672 100644
--- a/platform/wavelet3d/gfx_raster.sv
+++ b/rtl/gfx/gfx_raster.sv
diff --git a/platform/wavelet3d/gfx_regfile_io.sv b/rtl/gfx/gfx_regfile_io.sv
index 2459049..2459049 100644
--- a/platform/wavelet3d/gfx_regfile_io.sv
+++ b/rtl/gfx/gfx_regfile_io.sv
diff --git a/platform/wavelet3d/gfx_rst_sync.sv b/rtl/gfx/gfx_rst_sync.sv
index 2a8ea3b..2a8ea3b 100644
--- a/platform/wavelet3d/gfx_rst_sync.sv
+++ b/rtl/gfx/gfx_rst_sync.sv
diff --git a/platform/wavelet3d/gfx_sched.sv b/rtl/gfx/gfx_sched.sv
index b8b6b7e..0ffaecd 100644
--- a/platform/wavelet3d/gfx_sched.sv
+++ b/rtl/gfx/gfx_sched.sv
@@ -10,6 +10,8 @@ import gfx::*;
 	input  irq_lines  irq
 );
 
+	// verilator tracing_off
+
 	logic axi_ready, axi_valid, bram_ready, bram_read, bram_write, bram_write_next,
 	      mem_instr, mem_la_read, mem_la_write, mem_ready, mem_valid, select_bram;
 
diff --git a/platform/wavelet3d/gfx_shader.sv b/rtl/gfx/gfx_shader.sv
index 322ffb5..322ffb5 100644
--- a/platform/wavelet3d/gfx_shader.sv
+++ b/rtl/gfx/gfx_shader.sv
diff --git a/platform/wavelet3d/gfx_shader_back.sv b/rtl/gfx/gfx_shader_back.sv
index 4929192..4929192 100644
--- a/platform/wavelet3d/gfx_shader_back.sv
+++ b/rtl/gfx/gfx_shader_back.sv
diff --git a/platform/wavelet3d/gfx_shader_fpint.sv b/rtl/gfx/gfx_shader_fpint.sv
index a418dcc..a418dcc 100644
--- a/platform/wavelet3d/gfx_shader_fpint.sv
+++ b/rtl/gfx/gfx_shader_fpint.sv
diff --git a/platform/wavelet3d/gfx_shader_front.sv b/rtl/gfx/gfx_shader_front.sv
index 52074fd..52074fd 100644
--- a/platform/wavelet3d/gfx_shader_front.sv
+++ b/rtl/gfx/gfx_shader_front.sv
diff --git a/platform/wavelet3d/gfx_shader_group.sv b/rtl/gfx/gfx_shader_group.sv
index e668877..e668877 100644
--- a/platform/wavelet3d/gfx_shader_group.sv
+++ b/rtl/gfx/gfx_shader_group.sv
diff --git a/platform/wavelet3d/gfx_shader_mem.sv b/rtl/gfx/gfx_shader_mem.sv
index 403c9e4..403c9e4 100644
--- a/platform/wavelet3d/gfx_shader_mem.sv
+++ b/rtl/gfx/gfx_shader_mem.sv
diff --git a/platform/wavelet3d/gfx_shader_regs.sv b/rtl/gfx/gfx_shader_regs.sv
index ef3a129..ef3a129 100644
--- a/platform/wavelet3d/gfx_shader_regs.sv
+++ b/rtl/gfx/gfx_shader_regs.sv
diff --git a/platform/wavelet3d/gfx_shader_schedif.rdl b/rtl/gfx/gfx_shader_schedif.rdl
index c846da9..c846da9 100644
--- a/platform/wavelet3d/gfx_shader_schedif.rdl
+++ b/rtl/gfx/gfx_shader_schedif.rdl
diff --git a/platform/wavelet3d/gfx_shader_setup.sv b/rtl/gfx/gfx_shader_setup.sv
index f46fb66..f46fb66 100644
--- a/platform/wavelet3d/gfx_shader_setup.sv
+++ b/rtl/gfx/gfx_shader_setup.sv
diff --git a/platform/wavelet3d/gfx_shader_sfu.sv b/rtl/gfx/gfx_shader_sfu.sv
index d65e522..d65e522 100644
--- a/platform/wavelet3d/gfx_shader_sfu.sv
+++ b/rtl/gfx/gfx_shader_sfu.sv
diff --git a/platform/wavelet3d/gfx_shake.sv b/rtl/gfx/gfx_shake.sv
index baae0c3..baae0c3 100644
--- a/platform/wavelet3d/gfx_shake.sv
+++ b/rtl/gfx/gfx_shake.sv
diff --git a/platform/wavelet3d/gfx_sim_debug.sv b/rtl/gfx/gfx_sim_debug.sv
index 4b4622a..4b4622a 100644
--- a/platform/wavelet3d/gfx_sim_debug.sv
+++ b/rtl/gfx/gfx_sim_debug.sv
diff --git a/platform/wavelet3d/gfx_skid_buf.sv b/rtl/gfx/gfx_skid_buf.sv
index e3e5247..e3e5247 100644
--- a/platform/wavelet3d/gfx_skid_buf.sv
+++ b/rtl/gfx/gfx_skid_buf.sv
diff --git a/platform/wavelet3d/gfx_skid_flow.sv b/rtl/gfx/gfx_skid_flow.sv
index 7890ae3..7890ae3 100644
--- a/platform/wavelet3d/gfx_skid_flow.sv
+++ b/rtl/gfx/gfx_skid_flow.sv
diff --git a/platform/wavelet3d/gfx_wb.sv b/rtl/gfx/gfx_wb.sv
index 20c7c64..20c7c64 100644
--- a/platform/wavelet3d/gfx_wb.sv
+++ b/rtl/gfx/gfx_wb.sv
diff --git a/platform/wavelet3d/gfx_xbar_sched.sv b/rtl/gfx/gfx_xbar_sched.sv
index 95e4afb..95e4afb 100644
--- a/platform/wavelet3d/gfx_xbar_sched.sv
+++ b/rtl/gfx/gfx_xbar_sched.sv
diff --git a/rtl/gfx/mod.mk b/rtl/gfx/mod.mk
new file mode 100644
index 0000000..7525276
--- /dev/null
+++ b/rtl/gfx/mod.mk
@@ -0,0 +1,18 @@
+cores := gfx_shader_schedif
+
+define core
+  $(this)/deps := axixbar gfx_shader_schedif picorv32
+
+  $(this)/rtl_top := gfx_top
+  $(this)/rtl_dirs := .
+  $(this)/rtl_files := gfx_isa.sv gfx_pkg.sv
+endef
+
+define core/gfx_shader_schedif
+  $(this)/hooks := regblock
+
+  $(this)/regblock_rdl := gfx_shader_schedif.rdl
+  $(this)/regblock_top := gfx_shader_schedif
+  $(this)/regblock_args := --default-reset arst_n
+  $(this)/regblock_cpuif := axi4-lite
+endef
diff --git a/rtl/mod.mk b/rtl/mod.mk
index 081d3a3..2fb0ffa 100644
--- a/rtl/mod.mk
+++ b/rtl/mod.mk
@@ -1,5 +1,5 @@
 cores   := config debounce intc
-subdirs := cache core dma_axi32 fpu legacy_gfx perf picorv32 pkt_switch smp top wb2axip
+subdirs := cache core dma_axi32 fpu gfx legacy_gfx perf picorv32 pkt_switch smp top wb2axip
 
 define core/config
   $(this)/rtl_include_dirs := .