saji/groovylight
1
0
Fork 0
generated from saji/ecp5-template
Code Actions Packages Releases Wiki Activity

refactor around rgb666

Browse source 
remove 4xclocking for double-fetch architecture (still using 2xclock for
better S/H)
This commit is contained in:
saji 2024-09-19 00:03:19 -05:00
parent fe4a902bd8
commit 66b492e147
4 changed files with 76 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
src/groovylight/bitslicer.py
View file

@ -1,9 +1,8 @@
from amaranth import Array, Module, Cat, Mux, ShapeLike, Signal, Assert, unsigned from amaranth import Module, Cat, Mux, ShapeLike, Signal, Assert, unsigned
from amaranth.build import Platform from amaranth.build import Platform
from amaranth.lib import wiring, data from amaranth.lib import wiring, data
from amaranth.lib.wiring import In, Out from amaranth.lib.wiring import In, Out
from amaranth.lib.memory import Memory, ReadPort, WritePort from amaranth.lib.memory import Memory, ReadPort, WritePort
from amaranth.sim import Simulator
from amaranth.utils import ceil_log2 from amaranth.utils import ceil_log2
@ -18,7 +17,7 @@ class RGBLayout(data.StructLayout):
) )
Rgb888Layout = RGBLayout(8, 8, 8) Rgb666Layout = RGBLayout(6, 6, 6)
Rgb111Layout = RGBLayout(1, 1, 1) Rgb111Layout = RGBLayout(1, 1, 1)
@ -113,28 +112,31 @@ class SwapBuffer(wiring.Component):
shape=self.data_shape, depth=self.depth, init=[] shape=self.data_shape, depth=self.depth, init=[]
) )
read0 = self.bram0.read_port() rd0 = self.bram0.read_port()
write0 = self.bram0.write_port() wr0 = self.bram0.write_port()
read1 = self.bram1.read_port() rd1 = self.bram1.read_port()
write1 = self.bram1.write_port() wr1 = self.bram1.write_port()
# for name, member in self.write_port.signature.members.items():
# m.d.comb += self.write_port.members[name].eq(Mux(self.selector, write0[name], write1[name]))
#
m.d.comb += [ m.d.comb += [
write0.addr.eq(self.write_port.addr), # wr addres
write1.addr.eq(self.write_port.addr), wr0.addr.eq(self.write_port.addr),
write0.en.eq(~self.selector), wr1.addr.eq(self.write_port.addr),
write1.en.eq(self.selector), # write enables are based on selector
# self.write_port.data.eq(Mux(self.selector, write0.data, write1.data)), wr0.en.eq(~self.selector),
write0.data.eq(self.write_port.data), wr1.en.eq(self.selector),
write1.data.eq(self.write_port.data), # connect write data. This is FINE because
read0.addr.eq(self.read_port.addr), # there is one driver (the external writer)
read1.addr.eq(self.read_port.addr), # and we en based on selector so the other one isn't active
read0.en.eq(~self.selector), wr0.data.eq(self.write_port.data),
read1.en.eq(self.selector), wr1.data.eq(self.write_port.data),
self.read_port.data.eq(Mux(self.selector, read1.data, read0.data)), # connect rd address lines
rd0.addr.eq(self.read_port.addr),
rd1.addr.eq(self.read_port.addr),
rd0.en.eq(~self.selector),
rd1.en.eq(self.selector),
# we do this because the read_data lines are driven, this prevents
# double-driver situations even though we en using selector above
self.read_port.data.eq(Mux(self.selector, rd1.data, rd0.data)),
] ]
return m return m
@ -146,33 +148,48 @@ class Hub75StringDriver(wiring.Component):
it should send. it should send.
""" """
bcm_select: In(3)
done: Out(1)
start: In(1)
bram_port: In(ReadPort.Signature(addr_width=9, shape=Rgb888Layout))
display_out: Out(Hub75Data()) # data signal output.
def __init__(self, panel_length: int = 128, *, src_loc_at=0): def __init__(self, panel_length: int = 128, *, src_loc_at=0):
self.panel_length = panel_length self.panel_length = panel_length
super().__init__(None, src_loc_at=src_loc_at) super().__init__(
{
"bcm_select": In(3),
"done": Out(1),
"start": In(1),
"bram_port": In(
ReadPort.Signature(
addr_width=ceil_log2(panel_length),
shape=data.ArrayLayout(Rgb666Layout, 2),
)
),
"display_out": Out(Hub75Data()),
},
src_loc_at=src_loc_at,
)
def elaborate(self, platform: Platform) -> Module: def elaborate(self, platform: Platform) -> Module:
m = Module() m = Module()
# add two memories self._counter = counter = Signal(32) # unused count is optimized out
self._counter = counter = Signal(32)
m.d.sync += counter.eq(counter + 1) m.d.sync += counter.eq(counter + 1)
ram_rgb_slice = Cat( ram_rgb0_slice = Cat(
self.bram_port.data["red"].bit_select(self.bcm_select, 1), self.bram_port.data[0]["red"].bit_select(self.bcm_select, 1),
self.bram_port.data["blue"].bit_select(self.bcm_select, 1), self.bram_port.data[0]["blue"].bit_select(self.bcm_select, 1),
self.bram_port.data["green"].bit_select(self.bcm_select, 1), self.bram_port.data[0]["green"].bit_select(self.bcm_select, 1),
) )
ram_rgb1_slice = Cat(
self.bram_port.data[1]["red"].bit_select(self.bcm_select, 1),
self.bram_port.data[1]["blue"].bit_select(self.bcm_select, 1),
self.bram_port.data[1]["green"].bit_select(self.bcm_select, 1),
)
m.d.comb += [
self.display_out.rgb0.eq(ram_rgb0_slice),
self.display_out.rgb1.eq(ram_rgb1_slice),
]
m.d.sync += Assert(self.bcm_select < 6)
pixnum = Signal(range(self.panel_length), init=self.panel_length - 1) pixnum = Signal(ceil_log2(self.panel_length), init=self.panel_length - 1)
pixrow = Signal(1, init=0) m.d.comb += self.bram_port.addr.eq(pixnum)
m.d.comb += self.bram_port.addr.eq(Cat(pixrow, pixnum))
with m.FSM(): with m.FSM():
with m.State("init"): with m.State("init"):
@ -180,42 +197,22 @@ class Hub75StringDriver(wiring.Component):
self.done.eq(0), self.done.eq(0),
counter.eq(0), counter.eq(0),
pixnum.eq(self.panel_length - 1), pixnum.eq(self.panel_length - 1),
pixrow.eq(0),
] ]
with m.If(self.start == 1): with m.If(self.start == 1):
m.d.sync += self.bram_port.en.eq(1) m.d.sync += self.bram_port.en.eq(1)
m.next = "writerow" m.next = "writerow"
with m.State("prefetch"):
with m.If(counter == 0):
m.d.sync += pixrow.eq(0)
with m.Elif(counter == 1):
m.d.sync += pixrow.eq(1)
with m.Elif(counter == 2):
m.d.sync += self.display_out.rgb0.eq(ram_rgb_slice)
with m.Elif(counter == 3):
m.d.sync += [self.display_out.rgb1.eq(ram_rgb_slice), counter.eq(0)]
m.next = "writerow"
with m.State("writerow"): with m.State("writerow"):
with m.If(counter[0:1] == 0): with m.If(counter[0] == 0):
# rising edge of the clock # do nothing
m.d.sync += pixrow.eq(0) pass
with m.If(counter[0:1] == 1): with m.If((counter[0] == 1) & (pixnum != 0)):
m.d.sync += [ m.d.sync += pixnum.eq(pixnum - 1)
pixrow.eq(1),
self.display_out.rgb0.eq(ram_rgb_slice),
]
with m.If(counter[0:1] == 2):
m.d.sync += [
pixnum.eq(pixnum - 1),
pixrow.eq(0),
self.display_out.rgb1.eq(ram_rgb_slice),
]
with m.If(counter == 128 * 2 + 1):
with m.Else():
m.next = "done" m.next = "done"
with m.State("done"): with m.State("done"):
m.d.sync += self.done.eq(1) m.d.sync += [self.done.eq(1), self.bram_port.en.eq(0)]
m.next = "init" m.next = "init"
return m return m
@ -239,6 +236,10 @@ class Hub75EDriver(wiring.Component):
This version is faster than most implementations by merging the exposure This version is faster than most implementations by merging the exposure
period and the data-write period to happen simultaneously. As a result, period and the data-write period to happen simultaneously. As a result,
the display can be brighter due to higher duty cycle. the display can be brighter due to higher duty cycle.
NOTICE: this is a direct port of the old verilog code. It isn't up to date with the
modified structure. Notably, it uses RGB888 with double-fetch (4xclocking)
""" """
start: In(1) start: In(1)

12
src/groovylight/lineram.py
View file

@ -1,12 +0,0 @@
from amaranth import Module, Cat, Signal, Assert, unsigned
from amaranth.build import Platform
from amaranth.lib import wiring, data
from amaranth.lib.wiring import In, Out
from amaranth.lib.memory import Memory
# file to wrap line ram using PDPw16KD
# this is tricky.
def lineram():
return Memory(shape=unsigned(24), depth=512)

9
src/groovylight/test_hub75.py
View file

@ -5,7 +5,7 @@ from amaranth.lib.wiring import In, Out
from amaranth.lib.memory import Memory, WritePort from amaranth.lib.memory import Memory, WritePort
from amaranth.sim import Simulator from amaranth.sim import Simulator
from .bitslicer import Hub75StringDriver, Rgb888Layout from .bitslicer import Hub75StringDriver, Rgb666Layout
def test_stringdriver(): def test_stringdriver():
@ -15,7 +15,9 @@ def test_stringdriver():
# 3. slice the correct bit from the data. # 3. slice the correct bit from the data.
m = Module() m = Module()
m.submodules.dut = dut = Hub75StringDriver() m.submodules.dut = dut = Hub75StringDriver()
m.submodules.mem = mem = Memory(shape=Rgb888Layout, depth=512, init=[]) m.submodules.mem = mem = Memory(
shape=data.ArrayLayout(Rgb666Layout, 2), depth=128, init=[]
)
port = mem.read_port() port = mem.read_port()
wiring.connect(m, port, dut.bram_port) wiring.connect(m, port, dut.bram_port)
@ -26,12 +28,11 @@ def test_stringdriver():
ctx.set(dut.start, 1) ctx.set(dut.start, 1)
await ctx.tick() await ctx.tick()
ctx.set(dut.start, 0) ctx.set(dut.start, 0)
assert(ctx.get(dut.bram_port.en) == 1) assert ctx.get(dut.bram_port.en) == 1
pass pass
sim = Simulator(m) sim = Simulator(m)
sim.add_clock(1e-6) sim.add_clock(1e-6)
with sim.write_vcd("output.vcd"): with sim.write_vcd("output.vcd"):
sim.run_until(1e-6 * 1000) sim.run_until(1e-6 * 1000)

4
src/groovylight/test_swapbuffer.py
View file

@ -5,11 +5,11 @@ from amaranth.lib.wiring import In, Out
from amaranth.lib.memory import Memory, WritePort from amaranth.lib.memory import Memory, WritePort
from amaranth.sim import Simulator from amaranth.sim import Simulator
from .bitslicer import Hub75StringDriver, Rgb888Layout, SwapBuffer from .bitslicer import Hub75StringDriver, Rgb666Layout, SwapBuffer
def test_swapbuffer(): def test_swapbuffer():
dut = SwapBuffer(Rgb888Layout, 512) dut = SwapBuffer(Rgb666Layout, 512)
sim = Simulator(dut) sim = Simulator(dut)
sim.add_clock(1e-6) sim.add_clock(1e-6)