Himbaechel GUI #1295

mmicko · 2024-02-29T09:05:41Z

This extends Himbaechel API with additional methods for drawing bels, wires and pips. There is also configuration attribute to control if some of these are used and also do change in coordinate system (y axis).

Was mostly mimic what we do on ECP5 and XO2/3, and was not sure about equivalent for tile_wire (mapped to GfxTileWireId) so used flags for now, since it anyway keeps some additional custom info.

First few commits are mostly cleanup and fixes of some old standing GUI issues.

Would add at least basic things in Xilinx and Gowin when we agree on API level. Please do comment and suggest changes.

gatecat · 2024-03-13T13:20:27Z

himbaechel/uarch/xilinx/examples/arty-a35/blinky.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -ex
 yosys -p "synth_xilinx -flatten -abc9 -nobram -arch xc7 -top top; write_json blinky.json" blinky.v
-nextpnr-himbaechel --device xc7a35tcsg324-1 -o xdc=arty.xdc --json blinky.json -o fasm=blinky.fasm --router router2
+../../../../../nextpnr-himbaechel --device xc7a35tcsg324-1 -o xdc=arty.xdc --json blinky.json -o fasm=blinky.fasm --router router2


this breaks if someone does an out of tree build

gatecat · 2024-03-13T13:21:13Z

himbaechel/himbaechel_api.h

+    // Graphics
+    virtual uint32_t gfxAttributes() { return 0; }
+
+    virtual void gfxTileBel(std::vector<GraphicElement> &g, int x, int y, int z, int w, int h,


can you perhaps think of some slightly more descriptive names for these API functions, and also add some documentation about them, so I can review them better?

sure, will update these, but probably not today

gatecat · 2024-03-13T13:21:53Z

himbaechel/himbaechel_api.h

@@ -102,6 +109,20 @@ struct HimbaechelAPI
    virtual bool isClusterStrict(const CellInfo *cell) const;
    virtual bool getClusterPlacement(ClusterId cluster, BelId root_bel,
                                     std::vector<std::pair<CellInfo *, BelId>> &placement) const;
+
+    // Graphics
+    virtual uint32_t gfxAttributes() { return 0; }


I really don't like this function, can you think of a better way here, like perhaps a struct that the architecture configures?

mmicko · 2024-03-19T12:42:26Z

@gatecat Documentation is not added yet, but main question I have is if using tilewire as additional data is fine (need to bump db version in that case as well) ? not sure if there is other way we can actually use to determine which wire to draw.

gatecat · 2024-09-26T10:48:52Z

himbaechel/uarch/example/gfx.h

+
+NEXTPNR_NAMESPACE_BEGIN
+
+enum GfxTileWireId


this will need to be in a uarch-specific namespace, otherwise there will be conflicts

gatecat · 2024-09-26T10:49:41Z

himbaechel/himbaechel_dbgen/chip.py

@@ -857,3 +865,18 @@ def write_bba(self, filename):
            bba.ref('chip_info')
            self.serialise(bba)
            bba.pop()
+
+    def read_gfx_h(self, filename):


this is kind of horrid

gatecat · 2024-09-26T10:50:40Z

himbaechel/himbaechel_dbgen/chip.py

@@ -144,6 +144,7 @@ class TileWireData:
    index: int
    name: IdString
    wire_type: IdString
+    tile_wire: int


this should be given a name that makes it's very clear that it's gui-specific, otherwise it will be very unclear to anyone looking at the structures

himbaechel/arch.cc

stacksmith · 2024-10-02T01:56:00Z

Is this close to merging? I am pretty desperate to see things, and nextpnr-gowin --gui just crashes all the time now.

gatecat · 2024-11-21T13:37:49Z

himbaechel/himbaechel_dbgen/chip.py

@@ -229,9 +232,13 @@ def add_bel_pin(self, bel: BelData, pin: str, wire: str, dir: PinType):

    def create_wire(self, name: str, type: str="", const_value: str=""):
        # Create a new tile wire of a given name and type (optional) in the tile type
+        gfx_wire_id = 0
+        if (name) in self.gfx_wire_ids:


what are the brackets here for?

ah, that is leftover from past. removing it now

gatecat · 2024-11-21T13:40:08Z

himbaechel/himbaechel_dbgen/chip.py

@@ -166,6 +167,7 @@ def serialise_lists(self, context: str, bba: BBAWriter):
    def serialise(self, context: str, bba: BBAWriter):
        bba.u32(self.name.index)
        bba.u32(self.wire_type.index)
+        bba.u32(self.gfx_wire_id)


this is a breaking change for existing binaries so it needs a db version bump:

nextpnr/himbaechel/arch.cc

Line 36 in 9c2d96f

static constexpr int database_version = 4;

and

nextpnr/himbaechel/himbaechel_dbgen/chip.py

Line 834 in 9c2d96f

bba.u32(4) # version

this needs to go to 5, 4 is the current version on main

ok to rebase it now, so it is easier then to spot things like this ?

sounds like a good plan!

gatecat · 2024-11-21T14:13:37Z

Thanks, sorry for the delay in getting this merged!

mmicko · 2024-11-21T14:16:13Z

Thanks and no worries, was busy with other things anyway.

* Extend Himbaechel API with gfx drawing methods * Add bel drawing in example uarch * changed API and added tile wire id in db * extend API so we can distinguish CLK wires * added bit more wires * less horrid way of handling gfx ids * loop wire range * removed not needed brackets * bump database version to 5 * Removed not used GfxFlags

mmicko requested a review from gatecat February 29, 2024 09:05

mmicko force-pushed the micko/himbaechel_gui branch from 6d7e0cb to e3b9859 Compare February 29, 2024 09:34

gatecat reviewed Mar 13, 2024

View reviewed changes

mmicko force-pushed the micko/himbaechel_gui branch from e3b9859 to ddf3cbe Compare March 19, 2024 11:36

mmicko mentioned this pull request Apr 5, 2024

QT related and Example uarch cleanup #1308

Merged

mmicko force-pushed the micko/himbaechel_gui branch from 5d504c6 to 2f03e88 Compare April 5, 2024 10:39

mmicko force-pushed the micko/himbaechel_gui branch from 2f03e88 to 4749794 Compare August 20, 2024 07:20

Patronics mentioned this pull request Sep 25, 2024

Empty GUI grid with --gui using nexpnr-himbaechel on GW1NR-LV9; --gui-no-aa crashes. #1350

Open

gatecat reviewed Sep 26, 2024

View reviewed changes

himbaechel/arch.cc Show resolved Hide resolved

gatecat reviewed Nov 21, 2024

View reviewed changes

mmicko marked this pull request as ready for review November 21, 2024 13:38

gatecat reviewed Nov 21, 2024

View reviewed changes

mmicko force-pushed the micko/himbaechel_gui branch from d62c462 to 89e8599 Compare November 21, 2024 13:51

mmicko added 10 commits November 21, 2024 14:52

Extend Himbaechel API with gfx drawing methods

8bb97c7

Add bel drawing in example uarch

49c0d27

changed API and added tile wire id in db

49f098a

extend API so we can distinguish CLK wires

5b2100a

added bit more wires

9b66722

less horrid way of handling gfx ids

5c46ab5

loop wire range

57d098f

removed not needed brackets

ffb0711

bump database version to 5

6a6f7f5

Removed not used GfxFlags

184dc13

mmicko force-pushed the micko/himbaechel_gui branch from 89e8599 to 184dc13 Compare November 21, 2024 13:53

gatecat merged commit 5503546 into master Nov 21, 2024
16 checks passed

gatecat deleted the micko/himbaechel_gui branch November 21, 2024 14:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Himbaechel GUI #1295

Himbaechel GUI #1295

mmicko commented Feb 29, 2024

gatecat Mar 13, 2024

gatecat Mar 13, 2024

mmicko Mar 13, 2024

gatecat Mar 13, 2024

mmicko commented Mar 19, 2024

gatecat Sep 26, 2024

gatecat Sep 26, 2024

gatecat Sep 26, 2024

stacksmith commented Oct 2, 2024

gatecat Nov 21, 2024

mmicko Nov 21, 2024

gatecat Nov 21, 2024

gatecat Nov 21, 2024

mmicko Nov 21, 2024

gatecat Nov 21, 2024

gatecat commented Nov 21, 2024

mmicko commented Nov 21, 2024


		NEXTPNR_NAMESPACE_BEGIN

		enum GfxTileWireId

Himbaechel GUI #1295

Himbaechel GUI #1295

Conversation

mmicko commented Feb 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mmicko commented Mar 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stacksmith commented Oct 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gatecat commented Nov 21, 2024

mmicko commented Nov 21, 2024