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

DesignTools.makePhysNetNamesConsistent() to use hier name #735

Merged
merged 3 commits into from
Jun 29, 2023

Conversation

eddieh-xlnx
Copy link
Collaborator

Fixes bug introduced by #734.

@eddieh-xlnx eddieh-xlnx requested a review from clavin-xlnx June 29, 2023 19:19
@eddieh-xlnx eddieh-xlnx changed the title DesignTools.makePhysNetNamesConsisntent() to use hier name DesignTools.makePhysNetNamesConsistent() to use hier name Jun 29, 2023
Signed-off-by: Eddie Hung <[email protected]>
Signed-off-by: Eddie Hung <[email protected]>
@eddieh-xlnx eddieh-xlnx merged commit 263cfe1 into master Jun 29, 2023
@eddieh-xlnx eddieh-xlnx deleted the fix_makephysnetnames2 branch June 29, 2023 21:29
eddieh-xlnx added a commit that referenced this pull request Jul 5, 2023
commit 188e6c3
Author: Chris Lavin <[email protected]>
Date:   Wed Jul 5 11:15:30 2023 -0600

    Unroute site routing when removing a cell (#729)

    * Fixes an issue with makeBlackBox trying to remove pins from renamed nets

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

    * Adding code to properly unroute site routing of a cell when removed

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

    * Tweak description

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

    * Add test, more fixes

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

    * Fix test failure

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

    * Update src/com/xilinx/rapidwright/design/DesignTools.java

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

    * More fixes

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

    ---------

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

commit 830c4dc
Author: eddieh-xlnx <[email protected]>
Date:   Wed Jul 5 09:07:17 2023 -0700

    PartialRouter's global router to not unpreserve sink nodes (#736)

    * PartialRouter's global router to not unpreserve sinks nodes

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

    * Only disallow if input pin

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

    * Update comment

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

    * Refactor PartialRouter.getGlobalRoutingNodeStatus()

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

    * Remove extra char

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

    ---------

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

commit 263cfe1
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 29 14:29:52 2023 -0700

    DesignTools.makePhysNetNamesConsistent() to use hier name (#735)

    * DesignTools.makePhysNetNamesConsisntent() to use hier name

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

    * Another case

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

    * Remove unused

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

    ---------

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

commit 83807c9
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 29 11:53:59 2023 -0700

    DesignTools.makePhysNetNamesConsistent() to consider */<const{0,1}> (#734)

    Look at the non-hier net name to determine if GLOBAL_LOGIC{0,1}

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

commit beae92f
Author: zakn-amd <[email protected]>
Date:   Thu Jun 29 10:30:00 2023 -0700

    Add DcpToInterchange class (#704)

    * add module to convert DCP to FPGA Interchange

    Signed-off-by: Zak Nafziger <[email protected]>

    * Tidy up, use Paths.get() not Path.of()

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

    * Address review comments (retry)

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

    ---------

    Signed-off-by: Zak Nafziger <[email protected]>
    Signed-off-by: Eddie Hung <[email protected]>
    Co-authored-by: Eddie Hung <[email protected]>

commit b645df4
Author: Chris Lavin <[email protected]>
Date:   Thu Jun 29 10:22:16 2023 -0600

    Add compile step (#733)

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

commit 61e0f87
Author: eddieh-xlnx <[email protected]>
Date:   Wed Jun 28 13:24:32 2023 -0700

    Add EdifToLogicalNetlist to MainEntrypoint (#731)

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

commit 671515a
Author: eddieh-xlnx <[email protected]>
Date:   Tue Jun 27 13:14:35 2023 -0700

    [PhysNetlistReader] Set Cell type for routethru cells (#727)

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

commit 90e2c04
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 16:40:54 2023 -0600

    Fix Javadoc warnings (#723)

    * Fix JavaDoc warnings

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

    * More javadoc fixes

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

    * More javadoc fixes

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

    ---------

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

commit 92f595b
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 16:40:39 2023 -0600

    Fixes an issue with makeBlackBox trying to remove pins from renamed nets (#728)

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

commit 05ebb30
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 15:08:48 2023 -0600

    Multilevel macro expansion (#726)

    * Adds support for expanding the IOBUFDSE3 macro and OBUFTDS_DCIEN_DUAL_BUF

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

    * Add additional check

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

    ---------

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

commit 7af0bc6
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 22 17:00:31 2023 -0700

    TestReplaceEDIFInDCP to copy DCP before replacing in-place (#725)

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

commit d4a0f1a
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 22 16:10:29 2023 -0700

    DesignTools.createMissingSitePinInsts() to skip node-less site pins (#724)

    * Create test for a site pin that is not connected to any Node-s

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

    * DesignTools.createMissingSitePinInsts() to skip node-less site pins

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

    ---------

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

commit 33df8b1
Author: Chris Lavin <[email protected]>
Date:   Wed Jun 21 17:27:23 2023 -0600

    Bump Python to 2023.1.1

    Signed-off-by: Chris Lavin <[email protected]>
eddieh-xlnx added a commit that referenced this pull request Jul 5, 2023
commit 188e6c3
Author: Chris Lavin <[email protected]>
Date:   Wed Jul 5 11:15:30 2023 -0600

    Unroute site routing when removing a cell (#729)

    * Fixes an issue with makeBlackBox trying to remove pins from renamed nets

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

    * Adding code to properly unroute site routing of a cell when removed

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

    * Tweak description

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

    * Add test, more fixes

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

    * Fix test failure

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

    * Update src/com/xilinx/rapidwright/design/DesignTools.java

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

    * More fixes

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

    ---------

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

commit 830c4dc
Author: eddieh-xlnx <[email protected]>
Date:   Wed Jul 5 09:07:17 2023 -0700

    PartialRouter's global router to not unpreserve sink nodes (#736)

    * PartialRouter's global router to not unpreserve sinks nodes

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

    * Only disallow if input pin

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

    * Update comment

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

    * Refactor PartialRouter.getGlobalRoutingNodeStatus()

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

    * Remove extra char

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

    ---------

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

commit 263cfe1
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 29 14:29:52 2023 -0700

    DesignTools.makePhysNetNamesConsistent() to use hier name (#735)

    * DesignTools.makePhysNetNamesConsisntent() to use hier name

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

    * Another case

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

    * Remove unused

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

    ---------

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

commit 83807c9
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 29 11:53:59 2023 -0700

    DesignTools.makePhysNetNamesConsistent() to consider */<const{0,1}> (#734)

    Look at the non-hier net name to determine if GLOBAL_LOGIC{0,1}

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

commit beae92f
Author: zakn-amd <[email protected]>
Date:   Thu Jun 29 10:30:00 2023 -0700

    Add DcpToInterchange class (#704)

    * add module to convert DCP to FPGA Interchange

    Signed-off-by: Zak Nafziger <[email protected]>

    * Tidy up, use Paths.get() not Path.of()

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

    * Address review comments (retry)

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

    ---------

    Signed-off-by: Zak Nafziger <[email protected]>
    Signed-off-by: Eddie Hung <[email protected]>
    Co-authored-by: Eddie Hung <[email protected]>

commit b645df4
Author: Chris Lavin <[email protected]>
Date:   Thu Jun 29 10:22:16 2023 -0600

    Add compile step (#733)

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

commit 61e0f87
Author: eddieh-xlnx <[email protected]>
Date:   Wed Jun 28 13:24:32 2023 -0700

    Add EdifToLogicalNetlist to MainEntrypoint (#731)

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

commit 671515a
Author: eddieh-xlnx <[email protected]>
Date:   Tue Jun 27 13:14:35 2023 -0700

    [PhysNetlistReader] Set Cell type for routethru cells (#727)

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

commit 90e2c04
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 16:40:54 2023 -0600

    Fix Javadoc warnings (#723)

    * Fix JavaDoc warnings

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

    * More javadoc fixes

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

    * More javadoc fixes

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

    ---------

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

commit 92f595b
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 16:40:39 2023 -0600

    Fixes an issue with makeBlackBox trying to remove pins from renamed nets (#728)

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

commit 05ebb30
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 15:08:48 2023 -0600

    Multilevel macro expansion (#726)

    * Adds support for expanding the IOBUFDSE3 macro and OBUFTDS_DCIEN_DUAL_BUF

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

    * Add additional check

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

    ---------

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

commit 7af0bc6
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 22 17:00:31 2023 -0700

    TestReplaceEDIFInDCP to copy DCP before replacing in-place (#725)

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

commit d4a0f1a
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 22 16:10:29 2023 -0700

    DesignTools.createMissingSitePinInsts() to skip node-less site pins (#724)

    * Create test for a site pin that is not connected to any Node-s

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

    * DesignTools.createMissingSitePinInsts() to skip node-less site pins

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

    ---------

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

commit 33df8b1
Author: Chris Lavin <[email protected]>
Date:   Wed Jun 21 17:27:23 2023 -0600

    Bump Python to 2023.1.1

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

Signed-off-by: Eddie Hung <[email protected]>
eddieh-xlnx added a commit that referenced this pull request Oct 4, 2023
* ModuleInst.connect() to use net from 1st pass-thru-port

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

* UltraScaleClockRouting.routeVerticalToHorizontalDistributionLines() to reset parent

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

* ReportRouteStatusResult constructor to be public

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

* UltraScaleClockRouting to really reset parent pointer

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

* ModuleInst.connect() to not touch phys nets when pass-thru

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

* Ignore unconnected ports, use GLOBAL_LOGIC[01] for gnd/vcc nets

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

* Squashed commit of the following:

commit 188e6c3
Author: Chris Lavin <[email protected]>
Date:   Wed Jul 5 11:15:30 2023 -0600

    Unroute site routing when removing a cell (#729)

    * Fixes an issue with makeBlackBox trying to remove pins from renamed nets

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

    * Adding code to properly unroute site routing of a cell when removed

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

    * Tweak description

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

    * Add test, more fixes

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

    * Fix test failure

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

    * Update src/com/xilinx/rapidwright/design/DesignTools.java

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

    * More fixes

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

    ---------

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

commit 830c4dc
Author: eddieh-xlnx <[email protected]>
Date:   Wed Jul 5 09:07:17 2023 -0700

    PartialRouter's global router to not unpreserve sink nodes (#736)

    * PartialRouter's global router to not unpreserve sinks nodes

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

    * Only disallow if input pin

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

    * Update comment

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

    * Refactor PartialRouter.getGlobalRoutingNodeStatus()

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

    * Remove extra char

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

    ---------

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

commit 263cfe1
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 29 14:29:52 2023 -0700

    DesignTools.makePhysNetNamesConsistent() to use hier name (#735)

    * DesignTools.makePhysNetNamesConsisntent() to use hier name

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

    * Another case

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

    * Remove unused

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

    ---------

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

commit 83807c9
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 29 11:53:59 2023 -0700

    DesignTools.makePhysNetNamesConsistent() to consider */<const{0,1}> (#734)

    Look at the non-hier net name to determine if GLOBAL_LOGIC{0,1}

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

commit beae92f
Author: zakn-amd <[email protected]>
Date:   Thu Jun 29 10:30:00 2023 -0700

    Add DcpToInterchange class (#704)

    * add module to convert DCP to FPGA Interchange

    Signed-off-by: Zak Nafziger <[email protected]>

    * Tidy up, use Paths.get() not Path.of()

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

    * Address review comments (retry)

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

    ---------

    Signed-off-by: Zak Nafziger <[email protected]>
    Signed-off-by: Eddie Hung <[email protected]>
    Co-authored-by: Eddie Hung <[email protected]>

commit b645df4
Author: Chris Lavin <[email protected]>
Date:   Thu Jun 29 10:22:16 2023 -0600

    Add compile step (#733)

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

commit 61e0f87
Author: eddieh-xlnx <[email protected]>
Date:   Wed Jun 28 13:24:32 2023 -0700

    Add EdifToLogicalNetlist to MainEntrypoint (#731)

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

commit 671515a
Author: eddieh-xlnx <[email protected]>
Date:   Tue Jun 27 13:14:35 2023 -0700

    [PhysNetlistReader] Set Cell type for routethru cells (#727)

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

commit 90e2c04
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 16:40:54 2023 -0600

    Fix Javadoc warnings (#723)

    * Fix JavaDoc warnings

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

    * More javadoc fixes

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

    * More javadoc fixes

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

    ---------

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

commit 92f595b
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 16:40:39 2023 -0600

    Fixes an issue with makeBlackBox trying to remove pins from renamed nets (#728)

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

commit 05ebb30
Author: Chris Lavin <[email protected]>
Date:   Fri Jun 23 15:08:48 2023 -0600

    Multilevel macro expansion (#726)

    * Adds support for expanding the IOBUFDSE3 macro and OBUFTDS_DCIEN_DUAL_BUF

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

    * Add additional check

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

    ---------

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

commit 7af0bc6
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 22 17:00:31 2023 -0700

    TestReplaceEDIFInDCP to copy DCP before replacing in-place (#725)

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

commit d4a0f1a
Author: eddieh-xlnx <[email protected]>
Date:   Thu Jun 22 16:10:29 2023 -0700

    DesignTools.createMissingSitePinInsts() to skip node-less site pins (#724)

    * Create test for a site pin that is not connected to any Node-s

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

    * DesignTools.createMissingSitePinInsts() to skip node-less site pins

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

    ---------

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

commit 33df8b1
Author: Chris Lavin <[email protected]>
Date:   Wed Jun 21 17:27:23 2023 -0600

    Bump Python to 2023.1.1

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

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

* [RWRoute] Further fix/cleanup around alternate source pins

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

---------

Signed-off-by: Eddie Hung <[email protected]>
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