Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024.1.3 #1060

Merged
merged 15 commits into from
Oct 2, 2024
Merged

2024.1.3 #1060

merged 15 commits into from
Oct 2, 2024

Conversation

clavin-xlnx
Copy link
Member

No description provided.

clavin-xlnx and others added 9 commits September 16, 2024 17:36
Signed-off-by: Chris Lavin <[email protected]>
* [Gradle] Enable assertions for testLsf task

Signed-off-by: Eddie Hung <[email protected]>

* Revert "[Gradle] Enable assertions for testLsf task"

This reverts commit 9794157.

Signed-off-by: Eddie Hung <[email protected]>

* [LaunchTestsOnLsf] Invoke java with assertions enabled

Signed-off-by: Eddie Hung <[email protected]>

* Revert "[LaunchTestsOnLsf] Invoke java with assertions enabled"

This reverts commit b86852b.

Signed-off-by: Eddie Hung <[email protected]>

* [LaunchTestsOnLsf] Invoke java with assertions enabled

Signed-off-by: Eddie Hung <[email protected]>

---------

Signed-off-by: Eddie Hung <[email protected]>
Signed-off-by: Chris Lavin <[email protected]>
* Test for retargeting and relocating a design

Signed-off-by: Chris Lavin <[email protected]>

* Adds part retargeter example

Signed-off-by: Chris Lavin <[email protected]>

* Check in Vivado, test inverse as well

Signed-off-by: Chris Lavin <[email protected]>

---------

Signed-off-by: Chris Lavin <[email protected]>
* [TestBEL] Add testDIFFRXTXisNotFF()

Signed-off-by: Eddie Hung <[email protected]>

* Rename to testDIFFsAreNotFF() and add US+

Signed-off-by: Eddie Hung <[email protected]>

---------

Signed-off-by: Eddie Hung <[email protected]>
Co-authored-by: Chris Lavin <[email protected]>
* [TestDesign] Add test for net ordering of >= 2022.1 DCPs

Signed-off-by: Eddie Hung <[email protected]>

* [TestNet] Add testSingleClockNetSource()

Signed-off-by: Eddie Hung <[email protected]>

---------

Signed-off-by: Eddie Hung <[email protected]>
commit 9538212
Author: eddieh-xlnx <[email protected]>
Date:   Fri Sep 20 17:01:46 2024 -0700

    [RWRoute] Cleanup static router and RouterHelper (#1059)

    * [RWRoute] Replace LightweightRouteNode with RouterHelper inner classes

    Signed-off-by: Eddie Hung <[email protected]>

    * Fix typo

    Signed-off-by: Eddie Hung <[email protected]>

    * More renaming

    Signed-off-by: Eddie Hung <[email protected]>

    * Insert sink node into visited set

    Signed-off-by: Eddie Hung <[email protected]>

    * Revert RapidWrightDCP

    Signed-off-by: Eddie Hung <[email protected]>

    * Fix broken tests

    Signed-off-by: Eddie Hung <[email protected]>

    * Try removing RouteNode.equals(Node) too

    Signed-off-by: Eddie Hung <[email protected]>

    * Remove unused RouteNode.flags

    Signed-off-by: Eddie Hung <[email protected]>

    * Remove unused RouterHelper.isInvertibleDSPBELPin()

    Signed-off-by: Eddie Hung <[email protected]>

    * Fix broken assumption with INUSE nodes

    Signed-off-by: Eddie Hung <[email protected]>

    * Cleanup, use ArrayDeque not LinkedList

    Signed-off-by: Eddie Hung <[email protected]>

    * Fix testRouteStaticNet() to avoid site pins, and fix golden values

    Signed-off-by: Eddie Hung <[email protected]>

    * Static router to check INUSE/GND/CC before push, and ...

    ... check for unused LUT outputs on pop

    Signed-off-by: Eddie Hung <[email protected]>

    * Much fewer static GND sources, fewer PIPs

    Signed-off-by: Eddie Hung <[email protected]>

    * Fix testRouteStaticNet() to avoid site pins, and fix golden values

    Signed-off-by: Eddie Hung <[email protected]>

    * Fix value

    Signed-off-by: Eddie Hung <[email protected]>

    * Remove equals() overrides

    Signed-off-by: Eddie Hung <[email protected]>

    * GlobalSignalRouting to not use NodeWithPrev

    Signed-off-by: Eddie Hung <[email protected]>

    * Remove use of RouterHelper.NodeWithDelay

    Signed-off-by: Eddie Hung <[email protected]>

    * Revert "Remove equals() overrides"

    This reverts commit 3809009.

    Signed-off-by: Eddie Hung <[email protected]>

    * Remove commented code

    Signed-off-by: Eddie Hung <[email protected]>

    * Handle case where sink node is already used

    Signed-off-by: Eddie Hung <[email protected]>

    * Revert "Remove commented code"

    This reverts commit 4af0d8e.

    Signed-off-by: Eddie Hung <[email protected]>

    * Uncomment code

    Signed-off-by: Eddie Hung <[email protected]>

    * More refactoring/opt

    Signed-off-by: Eddie Hung <[email protected]>

    * Further reduction in static sources/PIPs

    Signed-off-by: Eddie Hung <[email protected]>

    * Check for routing errors too

    Signed-off-by: Eddie Hung <[email protected]>

    * Allow terminating on routed BOUNCE/BYPASS nodes

    Signed-off-by: Eddie Hung <[email protected]>

    * Sort sinks to be routed by tile

    Signed-off-by: Eddie Hung <[email protected]>

    * Improve re-use further

    Signed-off-by: Eddie Hung <[email protected]>

    * Do not place any static sources in the queue

    Signed-off-by: Eddie Hung <[email protected]>

    * Clarity

    Signed-off-by: Eddie Hung <[email protected]>

    * Add a NodeStatus.PRESERVED, static router to ignore those for now

    FIXME: Use those nodes as a last resort, if we can see the need
    Signed-off-by: Eddie Hung <[email protected]>

    * [PartialRouter] Disable ripup in global/static routing

    Signed-off-by: Eddie Hung <[email protected]>

    * Use net.getPins()

    Signed-off-by: Eddie Hung <[email protected]>

    * Move static net preserving into RouteNodeGraph

    Signed-off-by: Eddie Hung <[email protected]>

    * Add an extra assert

    Signed-off-by: Eddie Hung <[email protected]>

    * Revert "Add a NodeStatus.PRESERVED, static router to ignore those for now"

    This reverts commit 9b49488.

    Signed-off-by: Eddie Hung <[email protected]>

    * [EDIF] Fixes rare bus renaming collision (#1065)

    * [EDIF] Fixes rare bus renaming collision

    Signed-off-by: Chris Lavin <[email protected]>

    * Work-around for both issues, adds test for rare case

    Signed-off-by: Chris Lavin <[email protected]>

    * Minimizes bus suffix usage and resolves incorrect connectivity in MultGenerator

    Signed-off-by: Chris Lavin <[email protected]>

    * Fix comment

    Signed-off-by: Chris Lavin <[email protected]>

    * Update test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java

    Co-authored-by: eddieh-xlnx <[email protected]>
    Signed-off-by: Chris Lavin <[email protected]>

    * Fix typo

    Signed-off-by: Chris Lavin <[email protected]>

    ---------

    Signed-off-by: Chris Lavin <[email protected]>
    Co-authored-by: eddieh-xlnx <[email protected]>

    * [PartialRouter] Disable ripup in global/static routing

    Signed-off-by: Eddie Hung <[email protected]>

    * Move static net preserving into RouteNodeGraph

    Signed-off-by: Eddie Hung <[email protected]>

    * Update src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java

    Signed-off-by: eddieh-xlnx <[email protected]>

    ---------

    Signed-off-by: Eddie Hung <[email protected]>
    Signed-off-by: Chris Lavin <[email protected]>
    Signed-off-by: eddieh-xlnx <[email protected]>
    Co-authored-by: Chris Lavin <[email protected]>

commit 04e7c3c
Author: eddieh-xlnx <[email protected]>
Date:   Fri Sep 20 14:48:12 2024 -0700

    [PartialRouter] Disable ripup in global/static routing (#1067)

    * [PartialRouter] Disable ripup in global/static routing

    Signed-off-by: Eddie Hung <[email protected]>

    * Move static net preserving into RouteNodeGraph

    Signed-off-by: Eddie Hung <[email protected]>

    * Update src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java

    Signed-off-by: eddieh-xlnx <[email protected]>

    ---------

    Signed-off-by: Eddie Hung <[email protected]>
    Signed-off-by: eddieh-xlnx <[email protected]>

commit ef2a82d
Author: Chris Lavin <[email protected]>
Date:   Fri Sep 20 09:44:54 2024 -0600

    [EDIF] Fixes rare bus renaming collision (#1065)

    * [EDIF] Fixes rare bus renaming collision

    Signed-off-by: Chris Lavin <[email protected]>

    * Work-around for both issues, adds test for rare case

    Signed-off-by: Chris Lavin <[email protected]>

    * Minimizes bus suffix usage and resolves incorrect connectivity in MultGenerator

    Signed-off-by: Chris Lavin <[email protected]>

    * Fix comment

    Signed-off-by: Chris Lavin <[email protected]>

    * Update test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java

    Co-authored-by: eddieh-xlnx <[email protected]>
    Signed-off-by: Chris Lavin <[email protected]>

    * Fix typo

    Signed-off-by: Chris Lavin <[email protected]>

    ---------

    Signed-off-by: Chris Lavin <[email protected]>
    Co-authored-by: eddieh-xlnx <[email protected]>

commit e298a18
Author: eddieh-xlnx <[email protected]>
Date:   Thu Sep 19 19:20:58 2024 -0700

    [RWRoute] Always clear prev pointer of unpreserved RouteNode-s (#1056)

    * Use upload-artifact v4 for checks

    Signed-off-by: Wenhao Lin <[email protected]>

    * Make each uploaded artifact have a unique name

    Signed-off-by: Eddie Hung <[email protected]>

    * Try again

    Signed-off-by: Eddie Hung <[email protected]>

    * [RWRoute] Always clear prev pointer of unpreserved RouteNode-s

    Signed-off-by: Eddie Hung <[email protected]>

    * Tidy

    Signed-off-by: Eddie Hung <[email protected]>

    * Apply suggestions from code review

    Signed-off-by: eddieh-xlnx <[email protected]>

    * Update src/com/xilinx/rapidwright/rwroute/PartialRouter.java

    Signed-off-by: eddieh-xlnx <[email protected]>

    ---------

    Signed-off-by: Wenhao Lin <[email protected]>
    Signed-off-by: Eddie Hung <[email protected]>
    Signed-off-by: eddieh-xlnx <[email protected]>
    Co-authored-by: Wenhao Lin <[email protected]>

Signed-off-by: Eddie Hung <[email protected]>
eddieh-xlnx and others added 5 commits September 24, 2024 11:22
Conflicts:
	src/com/xilinx/rapidwright/rwroute/GlobalSignalRouting.java
Signed-off-by: Chris Lavin <[email protected]>
* [RWRoute] Remove unnecessary overrides

Signed-off-by: Eddie Hung <[email protected]>

* [Connection] getNodes() to return empty list not null

Signed-off-by: Eddie Hung <[email protected]>

* Improve TestRWRoute.testNonTimingDrivenPartialRouting()

Signed-off-by: Eddie Hung <[email protected]>

* [PartialRouter] isAccessible() to always allow preserved nets

Signed-off-by: Eddie Hung <[email protected]>

* [PartialRouter] Abandon unrouteable connections

Signed-off-by: Eddie Hung <[email protected]>

* [PartialRouter] Check sink routability after preserveAsync()

Signed-off-by: Eddie Hung <[email protected]>

* Tidy up

Signed-off-by: Eddie Hung <[email protected]>

* [RWRoute] Lazy source swapping

Signed-off-by: Eddie Hung <[email protected]>

* Add messaging

Signed-off-by: Eddie Hung <[email protected]>

* Try removing stashedPrev

Signed-off-by: Eddie Hung <[email protected]>

* Missing !

Signed-off-by: Eddie Hung <[email protected]>

* Fix abandoning connections for unpreservable

Signed-off-by: Eddie Hung <[email protected]>

* RWRoute to not pre-emptively set up second source

Signed-off-by: Eddie Hung <[email protected]>

* Refactor output pin swapping/connection abandonment

Signed-off-by: Eddie Hung <[email protected]>

* Abandon connections with message, and remove from sorted

Signed-off-by: Eddie Hung <[email protected]>

* Fix for nets with direct and indirect connections

Signed-off-by: Eddie Hung <[email protected]>

* Refactor into RWRoute.saveRoutingSource()

Signed-off-by: Eddie Hung <[email protected]>

* Refactor

Signed-off-by: Eddie Hung <[email protected]>

* Remove stale comment

Signed-off-by: Eddie Hung <[email protected]>

* Cache result of finding alt source pins

Signed-off-by: Eddie Hung <[email protected]>

* Inline trivial method

Signed-off-by: Eddie Hung <[email protected]>

* NetWrapper.getAltSource() to compute altSourceRnode when pin already exists

Signed-off-by: Eddie Hung <[email protected]>

* Allow promotion for PINBOUNCE to PINFEED_I

Signed-off-by: Eddie Hung <[email protected]>

* Fix assertion in RWRoute.push()

Signed-off-by: Eddie Hung <[email protected]>

* Fix broken assumptions

Signed-off-by: Eddie Hung <[email protected]>

* Move RWRoute.setupAlternateSource() to Connection.getOrCreateAlternateSource()

Signed-off-by: Eddie Hung <[email protected]>

* Fix RWRoute.saveRouting() return value

Signed-off-by: Eddie Hung <[email protected]>

* Consistency

Signed-off-by: Eddie Hung <[email protected]>

* Reverse whitespace change

Signed-off-by: Eddie Hung <[email protected]>

* Bump copyright

Signed-off-by: Eddie Hung <[email protected]>

* Direct connection if sink cannot be projected

Signed-off-by: Eddie Hung <[email protected]>

* Apply suggestions from code review

Signed-off-by: eddieh-xlnx <[email protected]>

* Set random seed for Test.testNonTimingDrivenPartialRouting()

Signed-off-by: Eddie Hung <[email protected]>

* Condition to avoid extra work

Signed-off-by: Eddie Hung <[email protected]>

* Move getPreservedNet() call to after

Signed-off-by: Eddie Hung <[email protected]>

* Remove unused method

Signed-off-by: Eddie Hung <[email protected]>

* Try AtomicReferenceArray instead of ConcurrentHashMap

Signed-off-by: Eddie Hung <[email protected]>

* Revert RapidWrightDCP submodule

Signed-off-by: Eddie Hung <[email protected]>

* Revert "Try AtomicReferenceArray instead of ConcurrentHashMap"

This reverts commit 12348ce.

Signed-off-by: Eddie Hung <[email protected]>

* Revert [PartialRouter] isAccessible() to always allow preserved nets

Signed-off-by: Eddie Hung <[email protected]>

As it seems to be an expensive look up in the hot path for little gain

* Add TODO

Signed-off-by: Eddie Hung <[email protected]>

* Add PartialRouter.saveRouting() override

Signed-off-by: Eddie Hung <[email protected]>

* Apply suggestions from code review

Signed-off-by: eddieh-xlnx <[email protected]>

---------

Signed-off-by: Eddie Hung <[email protected]>
Signed-off-by: eddieh-xlnx <[email protected]>
Signed-off-by: Chris Lavin <[email protected]>
@clavin-xlnx clavin-xlnx marked this pull request as ready for review October 2, 2024 18:51
Signed-off-by: Chris Lavin <[email protected]>
@clavin-xlnx clavin-xlnx merged commit abeb1f6 into master Oct 2, 2024
14 checks passed
@clavin-xlnx clavin-xlnx deleted the 2024.1.3 branch October 2, 2024 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants