nonbinary.computer / or1-design
OR-1 dataflow CPU sketch
fork atom

chore: remove all remaining stale references to legacy types

Orual bfc7c11e b17f212e

+30 -30
+1 -1
asm/__init__.py
··· 121 121 source: dfasm source code as a string 122 122 123 123 Returns: 124 - List of tokens (SMToken, IRAMWriteToken, MonadToken) in bootstrap order 124 + List of tokens (SMToken, PELocalWriteToken, MonadToken) in bootstrap order 125 125 126 126 Raises: 127 127 ValueError: If any pipeline stage reports errors
tests/test_cycle_timing.py tests/test_cycle_timing.py.bak
tests/test_e2e.py tests/test_e2e.py.bak
tests/test_exec_bootstrap.py tests/test_exec_bootstrap.py.bak
tests/test_integration.py tests/test_integration.py.bak
tests/test_network.py tests/test_network.py.bak
tests/test_network_events.py tests/test_network_events.py.bak
tests/test_pe.py tests/test_pe.py.bak
tests/test_pe_events.py tests/test_pe_events.py.bak
tests/test_seed_const.py tests/test_seed_const.py.bak
+19 -19
tests/test_sm.py
··· 47 47 sm.route_table[0] = collector 48 48 49 49 # Inject READ token targeting cell 10 50 - ret_route = CMToken(target=0, offset=5, ctx=1, data=0) 50 + ret_route = CMToken(target=0, offset=5, act_id=1, data=0) 51 51 read_token = SMToken(target=0, addr=10, op=MemOp.READ, flags=None, data=None, ret=ret_route) 52 52 inject_token(env, sm.input_store, read_token) 53 53 ··· 59 59 result = collector.items[0] 60 60 assert result.data == 0xBEEF 61 61 assert result.offset == 5 62 - assert result.ctx == 1 62 + assert result.act_id == 1 63 63 64 64 65 65 class TestAC3_2ReadOnEmpty: ··· 77 77 sm.route_table[0] = collector 78 78 79 79 # Inject READ token targeting cell 20 80 - ret_route = CMToken(target=0, offset=7, ctx=2, data=0) 80 + ret_route = CMToken(target=0, offset=7, act_id=2, data=0) 81 81 read_token = SMToken(target=0, addr=20, op=MemOp.READ, flags=None, data=None, ret=ret_route) 82 82 inject_token(env, sm.input_store, read_token) 83 83 ··· 108 108 sm.route_table[0] = collector 109 109 110 110 # Set up deferred read on cell 30 111 - ret_route = CMToken(target=0, offset=8, ctx=3, data=0) 111 + ret_route = CMToken(target=0, offset=8, act_id=3, data=0) 112 112 read_token = SMToken(target=0, addr=30, op=MemOp.READ, flags=None, data=None, ret=ret_route) 113 113 inject_token(env, sm.input_store, read_token) 114 114 ··· 131 131 result = collector.items[0] 132 132 assert result.data == 0xDEAD 133 133 assert result.offset == 8 134 - assert result.ctx == 3 134 + assert result.act_id == 3 135 135 136 136 # Verify deferred_read is cleared 137 137 assert sm.deferred_read is None ··· 205 205 sm.route_table[0] = collector 206 206 207 207 # Set up deferred read on cell 70 208 - ret_route = CMToken(target=0, offset=10, ctx=0, data=0) 208 + ret_route = CMToken(target=0, offset=10, act_id=0, data=0) 209 209 read_token = SMToken(target=0, addr=70, op=MemOp.READ, flags=None, data=None, ret=ret_route) 210 210 inject_token(env, sm.input_store, read_token) 211 211 ··· 265 265 sm.route_table[0] = collector 266 266 267 267 # Inject RD_INC 268 - ret_route = CMToken(target=0, offset=11, ctx=0, data=0) 268 + ret_route = CMToken(target=0, offset=11, act_id=0, data=0) 269 269 inc_token = SMToken(target=0, addr=100, op=MemOp.RD_INC, flags=None, data=None, ret=ret_route) 270 270 inject_token(env, sm.input_store, inc_token) 271 271 ··· 291 291 sm.route_table[0] = collector 292 292 293 293 # Inject RD_INC 294 - ret_route = CMToken(target=0, offset=12, ctx=0, data=0) 294 + ret_route = CMToken(target=0, offset=12, act_id=0, data=0) 295 295 inc_token = SMToken(target=0, addr=110, op=MemOp.RD_INC, flags=None, data=None, ret=ret_route) 296 296 inject_token(env, sm.input_store, inc_token) 297 297 ··· 317 317 sm.route_table[0] = collector 318 318 319 319 # Inject RD_DEC 320 - ret_route = CMToken(target=0, offset=13, ctx=0, data=0) 320 + ret_route = CMToken(target=0, offset=13, act_id=0, data=0) 321 321 dec_token = SMToken(target=0, addr=120, op=MemOp.RD_DEC, flags=None, data=None, ret=ret_route) 322 322 inject_token(env, sm.input_store, dec_token) 323 323 ··· 338 338 assert sm.cells[130].pres == Presence.EMPTY 339 339 340 340 # Inject RD_INC 341 - ret_route = CMToken(target=0, offset=14, ctx=0, data=0) 341 + ret_route = CMToken(target=0, offset=14, act_id=0, data=0) 342 342 inc_token = SMToken(target=0, addr=130, op=MemOp.RD_INC, flags=None, data=None, ret=ret_route) 343 343 inject_token(env, sm.input_store, inc_token) 344 344 ··· 365 365 sm.route_table[0] = collector 366 366 367 367 # Inject RD_INC on cell 256 (should be rejected) 368 - ret_route = CMToken(target=0, offset=15, ctx=0, data=0) 368 + ret_route = CMToken(target=0, offset=15, act_id=0, data=0) 369 369 inc_token = SMToken(target=0, addr=256, op=MemOp.RD_INC, flags=None, data=None, ret=ret_route) 370 370 inject_token(env, sm.input_store, inc_token) 371 371 ··· 391 391 collector = simpy.Store(env) 392 392 sm.route_table[0] = collector 393 393 394 - ret_a = CMToken(target=0, offset=20, ctx=0, data=0) 395 - ret_b = CMToken(target=0, offset=21, ctx=1, data=0) 394 + ret_a = CMToken(target=0, offset=20, act_id=0, data=0) 395 + ret_b = CMToken(target=0, offset=21, act_id=1, data=0) 396 396 read_a = SMToken(target=0, addr=140, op=MemOp.READ, flags=None, data=None, ret=ret_a) 397 397 read_b = SMToken(target=0, addr=150, op=MemOp.READ, flags=None, data=None, ret=ret_b) 398 398 ··· 447 447 sm.route_table[0] = collector 448 448 449 449 # Inject CMP_SW with flags=10 (expected), data=99 (new) 450 - ret_route = CMToken(target=0, offset=22, ctx=0, data=0) 450 + ret_route = CMToken(target=0, offset=22, act_id=0, data=0) 451 451 cas_token = SMToken(target=0, addr=160, op=MemOp.CMP_SW, flags=10, data=99, ret=ret_route) 452 452 inject_token(env, sm.input_store, cas_token) 453 453 ··· 473 473 sm.route_table[0] = collector 474 474 475 475 # Inject CMP_SW with flags=20 (mismatch), data=99 (new) 476 - ret_route = CMToken(target=0, offset=23, ctx=0, data=0) 476 + ret_route = CMToken(target=0, offset=23, act_id=0, data=0) 477 477 cas_token = SMToken(target=0, addr=170, op=MemOp.CMP_SW, flags=20, data=99, ret=ret_route) 478 478 inject_token(env, sm.input_store, cas_token) 479 479 ··· 499 499 sm.route_table[0] = collector 500 500 501 501 # Inject CMP_SW on cell 256 (should be rejected) 502 - ret_route = CMToken(target=0, offset=24, ctx=0, data=0) 502 + ret_route = CMToken(target=0, offset=24, act_id=0, data=0) 503 503 cas_token = SMToken(target=0, addr=256, op=MemOp.CMP_SW, flags=10, data=99, ret=ret_route) 504 504 inject_token(env, sm.input_store, cas_token) 505 505 ··· 531 531 op=token.op, 532 532 flags=token.flags, 533 533 data=token.data, 534 - ret=CMToken(target=0, offset=0, ctx=0, data=0), 534 + ret=CMToken(target=0, offset=0, act_id=0, data=0), 535 535 ) 536 536 537 537 # Pre-populate target cell as FULL if it's an atomic operation ··· 807 807 sm.route_table[0] = collector 808 808 809 809 # Inject RD_DEC 810 - ret_route = CMToken(target=0, offset=16, ctx=0, data=0) 810 + ret_route = CMToken(target=0, offset=16, act_id=0, data=0) 811 811 dec_token = SMToken(target=0, addr=150, op=MemOp.RD_DEC, flags=None, data=None, ret=ret_route) 812 812 inject_token(env, sm.input_store, dec_token) 813 813 ··· 850 850 assert sm.cells[210].pres == Presence.EMPTY 851 851 852 852 # Inject CMP_SW on EMPTY cell 853 - ret_route = CMToken(target=0, offset=17, ctx=0, data=0) 853 + ret_route = CMToken(target=0, offset=17, act_id=0, data=0) 854 854 cas_token = SMToken( 855 855 target=0, 856 856 addr=210,
+10 -10
tests/test_sm_events.py
··· 71 71 sm.cells[5].data_l = 0x5555 72 72 73 73 # Inject READ token 74 - ret_route = CMToken(target=0, offset=0, ctx=0, data=0) 74 + ret_route = CMToken(target=0, offset=0, act_id=0, data=0) 75 75 read_token = SMToken(target=0, addr=5, op=MemOp.READ, flags=None, data=None, ret=ret_route) 76 76 inject_token(env, sm.input_store, read_token) 77 77 ··· 181 181 sm.route_table[0] = collector 182 182 183 183 # Set up deferred read on cell 50 184 - ret_route = CMToken(target=0, offset=0, ctx=0, data=0) 184 + ret_route = CMToken(target=0, offset=0, act_id=0, data=0) 185 185 read_token = SMToken(target=0, addr=50, op=MemOp.READ, flags=None, data=None, ret=ret_route) 186 186 inject_token(env, sm.input_store, read_token) 187 187 ··· 221 221 sm.cells[100].data_l = 42 222 222 223 223 # Inject RD_INC token 224 - ret_route = CMToken(target=0, offset=0, ctx=0, data=0) 224 + ret_route = CMToken(target=0, offset=0, act_id=0, data=0) 225 225 inc_token = SMToken(target=0, addr=100, op=MemOp.RD_INC, flags=None, data=None, ret=ret_route) 226 226 inject_token(env, sm.input_store, inc_token) 227 227 ··· 255 255 assert sm.cells[60].pres == Presence.EMPTY 256 256 257 257 # Inject READ token 258 - ret_route = CMToken(target=0, offset=0, ctx=0, data=0) 258 + ret_route = CMToken(target=0, offset=0, act_id=0, data=0) 259 259 read_token = SMToken(target=0, addr=60, op=MemOp.READ, flags=None, data=None, ret=ret_route) 260 260 inject_token(env, sm.input_store, read_token) 261 261 ··· 285 285 sm.route_table[0] = collector 286 286 287 287 # Set up deferred read on cell 70 288 - ret_route = CMToken(target=0, offset=0, ctx=0, data=0) 288 + ret_route = CMToken(target=0, offset=0, act_id=0, data=0) 289 289 read_token = SMToken(target=0, addr=70, op=MemOp.READ, flags=None, data=None, ret=ret_route) 290 290 inject_token(env, sm.input_store, read_token) 291 291 ··· 329 329 sm.cells[80].data_l = 0xCAFE 330 330 331 331 # Inject READ token 332 - ret_route = CMToken(target=0, offset=5, ctx=2, data=0) 332 + ret_route = CMToken(target=0, offset=5, act_id=2, data=0) 333 333 read_token = SMToken(target=0, addr=80, op=MemOp.READ, flags=None, data=None, ret=ret_route) 334 334 inject_token(env, sm.input_store, read_token) 335 335 ··· 341 341 rs = result_sent_events[0] 342 342 assert rs.token.data == 0xCAFE 343 343 assert rs.token.offset == 5 344 - assert rs.token.ctx == 2 344 + assert rs.token.act_id == 2 345 345 assert rs.component == "sm:0" 346 346 347 347 def test_result_sent_on_atomic(self): ··· 361 361 sm.cells[110].data_l = 100 362 362 363 363 # Inject RD_INC token 364 - ret_route = CMToken(target=0, offset=12, ctx=1, data=0) 364 + ret_route = CMToken(target=0, offset=12, act_id=1, data=0) 365 365 inc_token = SMToken(target=0, addr=110, op=MemOp.RD_INC, flags=None, data=None, ret=ret_route) 366 366 inject_token(env, sm.input_store, inc_token) 367 367 ··· 387 387 sm.route_table[0] = collector 388 388 389 389 # Set up deferred read on cell 120 390 - ret_route = CMToken(target=0, offset=15, ctx=3, data=0) 390 + ret_route = CMToken(target=0, offset=15, act_id=3, data=0) 391 391 read_token = SMToken(target=0, addr=120, op=MemOp.READ, flags=None, data=None, ret=ret_route) 392 392 inject_token(env, sm.input_store, read_token) 393 393 ··· 408 408 rs = result_sent_events[0] 409 409 assert rs.token.data == 0x8888 410 410 assert rs.token.offset == 15 411 - assert rs.token.ctx == 3 411 + assert rs.token.act_id == 3
tests/test_sm_graph_nodes.py tests/test_sm_graph_nodes.py.bak