Skip to content

Commit 797c3ba

Browse files
committed
style: adjust indentation and formatting in test files for consistency
1 parent 3aa5361 commit 797c3ba

File tree

3 files changed

+57
-51
lines changed

3 files changed

+57
-51
lines changed

tests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# Makes tests a package for pytest discovery.
1+
# Makes tests a package for pytest discovery.

tests/test_assembler.py

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
import os
44
from tinygpu.assembler import assemble_file
55

6+
67
def test_assemble_file_basic():
7-
code = """
8-
start:
9-
LOAD R1, 42
10-
ADD R2, R1, 1
11-
JMP start
12-
"""
13-
with tempfile.NamedTemporaryFile("w", delete=False, suffix=".tgpu") as f:
14-
f.write(code)
15-
fname = f.name
16-
try:
17-
program, labels = assemble_file(fname)
18-
assert labels["start"] == 0
19-
assert program[0][0] == "LOAD"
20-
assert program[1][0] == "ADD"
21-
assert program[2][0] == "JMP"
22-
assert program[2][1][0] == "start" or program[2][1][0] == 0
23-
finally:
24-
os.remove(fname)
8+
code = """
9+
start:
10+
LOAD R1, 42
11+
ADD R2, R1, 1
12+
JMP start
13+
"""
14+
with tempfile.NamedTemporaryFile("w", delete=False, suffix=".tgpu") as f:
15+
f.write(code)
16+
fname = f.name
17+
try:
18+
program, labels = assemble_file(fname)
19+
assert labels["start"] == 0
20+
assert program[0][0] == "LOAD"
21+
assert program[1][0] == "ADD"
22+
assert program[2][0] == "JMP"
23+
assert program[2][1][0] == "start" or program[2][1][0] == 0
24+
finally:
25+
os.remove(fname)

tests/test_gpu.py

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,43 @@
22
import numpy as np
33
from tinygpu.gpu import TinyGPU
44

5+
56
def test_tinygpu_init():
6-
gpu = TinyGPU(num_threads=4, num_registers=8, mem_size=16)
7-
assert gpu.num_threads == 4
8-
assert gpu.num_registers == 8
9-
assert gpu.mem_size == 16
10-
assert gpu.registers.shape == (4, 8)
11-
assert gpu.memory.shape == (16,)
12-
assert gpu.pc.shape == (4,)
13-
assert gpu.active.shape == (4,)
7+
gpu = TinyGPU(num_threads=4, num_registers=8, mem_size=16)
8+
assert gpu.num_threads == 4
9+
assert gpu.num_registers == 8
10+
assert gpu.mem_size == 16
11+
assert gpu.registers.shape == (4, 8)
12+
assert gpu.memory.shape == (16,)
13+
assert gpu.pc.shape == (4,)
14+
assert gpu.active.shape == (4,)
15+
1416

1517
def test_tinygpu_step_and_run():
16-
gpu = TinyGPU(num_threads=2, num_registers=4, mem_size=8)
17-
# Fake program: increment R0, halt after 2 steps
18-
gpu.program = [
19-
("LOAD", [("R", 0), 1]),
20-
("ADD", [("R", 0), ("R", 0), 1]),
21-
]
22-
gpu.pc[:] = 0
23-
gpu.active[:] = True
24-
gpu.sync_waiting[:] = False
25-
gpu.history_registers = []
26-
gpu.history_memory = []
27-
gpu.history_pc = []
28-
# Patch INSTRUCTIONS for test
29-
from tinygpu import instructions
30-
def fake_load(self, tid, reg, val):
31-
self.registers[tid, reg[1]] = val
32-
def fake_add(self, tid, reg, reg2, val):
33-
self.registers[tid, reg[1]] = self.registers[tid, reg2[1]] + val
34-
instructions.INSTRUCTIONS["LOAD"] = fake_load
35-
instructions.INSTRUCTIONS["ADD"] = fake_add
36-
# After first step, both instructions are executed for both threads
37-
gpu.step()
38-
# LOAD sets R0=1, then ADD sets R0=2 in the same step
39-
assert np.all(gpu.registers[:,0] == 2)
18+
gpu = TinyGPU(num_threads=2, num_registers=4, mem_size=8)
19+
# Fake program: increment R0, halt after 2 steps
20+
gpu.program = [
21+
("LOAD", [("R", 0), 1]),
22+
("ADD", [("R", 0), ("R", 0), 1]),
23+
]
24+
gpu.pc[:] = 0
25+
gpu.active[:] = True
26+
gpu.sync_waiting[:] = False
27+
gpu.history_registers = []
28+
gpu.history_memory = []
29+
gpu.history_pc = []
30+
# Patch INSTRUCTIONS for test
31+
from tinygpu import instructions
32+
33+
def fake_load(self, tid, reg, val):
34+
self.registers[tid, reg[1]] = val
35+
36+
def fake_add(self, tid, reg, reg2, val):
37+
self.registers[tid, reg[1]] = self.registers[tid, reg2[1]] + val
38+
39+
instructions.INSTRUCTIONS["LOAD"] = fake_load
40+
instructions.INSTRUCTIONS["ADD"] = fake_add
41+
# After first step, both instructions are executed for both threads
42+
gpu.step()
43+
# LOAD sets R0=1, then ADD sets R0=2 in the same step
44+
assert np.all(gpu.registers[:, 0] == 2)

0 commit comments

Comments
 (0)