Clean up CPU templates

Author: object-Object

python/src/mlogv32/preprocessor/app.py

@@ -252,6 +252,7 @@ def _render_template(
         [LocalVariables],
         force=True,
         VARIABLE_0_TO_PAGE_OFFSET="".join(variable_0_to_page_offset),
+        **config.inputs,
     )
 
     i = LocalVariablesEnv.of(worker_env).largest_local_variable
@@ -283,6 +284,7 @@ def _render_template(
         csrs=config.csrs,
         labels=worker_labels,
         VARIABLE_0_TO_PAGE_OFFSET="".join(variable_0_to_page_offset),
+        **config.inputs,
     )
 
     # preprocess other code snippets

python/src/mlogv32/preprocessor/models.py

@@ -33,6 +33,7 @@ class BuildConfig(BaseModel):
     templates: Templates
     schematics: Schematics
     configs: RelativePath
+    inputs: dict[str, Any]
     instructions: list[Instruction]
     csrs: dict[str, CSR]
 

src/cpu/constants.jinja

@@ -1,8 +1,5 @@
 #% from 'worker.mlog.jinja' import fetch_variables with context
 
-#% extends 'constants.jinja'
-#% block contents
-
 #% set REGISTERS = 'cell1'
 #% set LABELS = 'cell2'
 
@@ -372,8 +369,7 @@ lookup_variable:
 
     set @counter ret
 
-#% endblock contents
-
+#% if false
 # disable mlogls warnings
 # {% raw %}
 # common preprocessor constants
@@ -421,3 +417,4 @@ set _ csr_mie
 set _ csr_satp
 set _ csr_mideleg
 # {% endraw %}
+#% endif

src/cpu/controller.mlog.jinja

@@ -15,6 +15,24 @@ schematics:
 
 configs: ../config/configs.yaml
 
+inputs:
+  LOOKUP_PROC_SIZE: 260 # number of variables per lookup proc
+  ROM_BYTE_OFFSET: 174 # start character for ROM string byte data
+  ROM_PROC_BYTES: 16384 # number of bytes per ROM proc
+  RAM_PROC_BYTES: 16384 # number of bytes per RAM proc
+  RAM_PROC_VARS: 4096 # number of variables per RAM proc
+
+  # ROM starts at 0x00000000, so we don't need a variable for it
+  RAM_START:  '0x80000000'
+  MMIO_START: '0xf0000000'
+  SYSCON:     '0xfffffff0'
+
+  UART_RX_READ:  254
+  UART_RX_WRITE: 255
+  UART_TX_START: 256
+  UART_TX_READ:  510
+  UART_TX_WRITE: 511
+
 instructions:
   # runtime handlers
   - label: BEQ

src/cpu/cpu.yaml

@@ -1,70 +1,3 @@
-#% macro fetch_variables()
-    read _rom prev_proc "_rom"
-    read __etext prev_proc "__etext"
-    read _address prev_proc "_address"
-    read address prev_proc "address"
-    read breakpoint_address prev_proc "breakpoint_address"
-    read csr_mideleg prev_proc "csr_mideleg"
-    read csr_mie prev_proc "csr_mie"
-    read csr_minstret prev_proc "csr_minstret"
-    read csr_mip prev_proc "csr_mip"
-    read csr_mstatus prev_proc "csr_mstatus"
-    read csr_mtime prev_proc "csr_mtime"
-    read csr_mtimecmp prev_proc "csr_mtimecmp"
-    read csr_mtimecmph prev_proc "csr_mtimecmph"
-    read csr_mtimeh prev_proc "csr_mtimeh"
-    read csr_satp prev_proc "csr_satp"
-    read csr_stimecmp prev_proc "csr_stimecmp"
-    read csr_stimecmph prev_proc "csr_stimecmph"
-    read effective_privilege_mode prev_proc "effective_privilege_mode"
-    read icache_ram prev_proc "icache_ram"
-    read icache_var prev_proc "icache_var"
-    read imm prev_proc "imm"
-    read length prev_proc "length"
-    read mcause prev_proc "mcause"
-    read mtval prev_proc "mtval"
-    read next_pc prev_proc "next_pc"
-    read op_id prev_proc "op_id"
-    read pc prev_proc "pc"
-    read privilege_mode prev_proc "privilege_mode"
-    read ram prev_proc "ram"
-    read rd prev_proc "rd"
-    read rd_id prev_proc "rd_id"
-    read result prev_proc "result"
-    read rs1 prev_proc "rs1"
-    read rs1_id prev_proc "rs1_id"
-    read rs2 prev_proc "rs2"
-    read rs2_id prev_proc "rs2_id"
-    read state prev_proc "state"
-    read value prev_proc "value"
-    read variable prev_proc "variable"
-
-    read ret prev_proc "ret"
-    read ret2 prev_proc "ret2"
-    read ret3 prev_proc "ret3"
-    read ret4 prev_proc "ret4"
-
-    read nonlocal1 prev_proc "nonlocal1"
-    read nonlocal2 prev_proc "nonlocal2"
-
-#% do reset_locals()
-    read {{local_variable()}} prev_proc "{{ local_variable(1) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(2) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(3) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(4) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(5) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(6) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(7) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(8) }}"
-    read {{local_variable()}} prev_proc "{{ local_variable(9) }}"
-#% endmacro
-
-# {% macro start_assert_length(n) %}{{ n }}{{ '\n#directive start_assert_length ' }}{{ n }}{% endmacro %}
-
-#%# hack: use extends so we don't need to individually import all of the constants
-#% extends 'constants.jinja'
-#% block contents
-
 #%# linked buildings
 
 #% set UART_START_LINK = 16
@@ -100,12 +33,16 @@
 #% set labels.end_instruction                             = _labels_vals|last + 2
 #% set labels.end_instruction_trap                        = _labels_vals|last + 6
 
+#%# macros
+
+#% macro start_assert_length(n)
+#{- n
+#directive start_assert_length {{ n }}
+#%- endmacro
+
 reset:
     setrate 1000
 
-    # define this variable FIRST so that we can read other variables over it
-    # set _rom null
-
     # load config
     read MEMORY_X {{CONFIG}} "MEMORY_X"
     read MEMORY_Y {{CONFIG}} "MEMORY_Y"
@@ -131,6 +68,67 @@ reset:
 
 #directive start_fetch
 
+#% macro fetch_variables()
+    read _rom prev_proc "_rom"
+    read __etext prev_proc "__etext"
+    read _address prev_proc "_address"
+    read address prev_proc "address"
+    read breakpoint_address prev_proc "breakpoint_address"
+    read csr_mideleg prev_proc "csr_mideleg"
+    read csr_mie prev_proc "csr_mie"
+    read csr_minstret prev_proc "csr_minstret"
+    read csr_mip prev_proc "csr_mip"
+    read csr_mstatus prev_proc "csr_mstatus"
+    read csr_mtime prev_proc "csr_mtime"
+    read csr_mtimecmp prev_proc "csr_mtimecmp"
+    read csr_mtimecmph prev_proc "csr_mtimecmph"
+    read csr_mtimeh prev_proc "csr_mtimeh"
+    read csr_satp prev_proc "csr_satp"
+    read csr_stimecmp prev_proc "csr_stimecmp"
+    read csr_stimecmph prev_proc "csr_stimecmph"
+    read effective_privilege_mode prev_proc "effective_privilege_mode"
+    read icache_ram prev_proc "icache_ram"
+    read icache_var prev_proc "icache_var"
+    read imm prev_proc "imm"
+    read length prev_proc "length"
+    read mcause prev_proc "mcause"
+    read mtval prev_proc "mtval"
+    read next_pc prev_proc "next_pc"
+    read op_id prev_proc "op_id"
+    read pc prev_proc "pc"
+    read privilege_mode prev_proc "privilege_mode"
+    read ram prev_proc "ram"
+    read rd prev_proc "rd"
+    read rd_id prev_proc "rd_id"
+    read result prev_proc "result"
+    read rs1 prev_proc "rs1"
+    read rs1_id prev_proc "rs1_id"
+    read rs2 prev_proc "rs2"
+    read rs2_id prev_proc "rs2_id"
+    read state prev_proc "state"
+    read value prev_proc "value"
+    read variable prev_proc "variable"
+
+    read ret prev_proc "ret"
+    read ret2 prev_proc "ret2"
+    read ret3 prev_proc "ret3"
+    read ret4 prev_proc "ret4"
+
+    read nonlocal1 prev_proc "nonlocal1"
+    read nonlocal2 prev_proc "nonlocal2"
+
+#% do reset_locals()
+    read {{local_variable()}} prev_proc "{{ local_variable(1) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(2) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(3) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(4) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(5) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(6) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(7) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(8) }}"
+    read {{local_variable()}} prev_proc "{{ local_variable(9) }}"
+#% endmacro
+
 #{ fetch_variables()
 
 #directive end_fetch
@@ -2703,11 +2701,9 @@ MLOGSYS__decode_loop:
 
     jump end_instruction always
 
-#% endblock contents
-
+#% if false
 # disable mlogls warnings
-# put this at the end of the file so it's not included in the output
-# and so that if we go over the 1000 instruction limit, we can ignore the errors below this line
+# put this at the end of the file so if we go over the 1000 instruction limit, we can ignore the errors below this line
 # {% raw %}
 # common preprocessor constants
 set {{ null
@@ -2853,3 +2849,4 @@ jump csr_write_sstatus always
 jump csr_write_stimecmp always
 jump csr_write_stimecmph always
 # {% endraw %}
+#% endif