Merge pull request #859 from Xilinx/2023.2.0

Initial 2023.2.0 build

.classpath

@@ -17,7 +17,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/reflectasm-1.11.9.jar"/>
-	<classpathentry kind="lib" path="jars/protobuf-java-3.11.4.jar"/>
+	<classpathentry kind="lib" path="jars/protobuf-java-3.25.0.jar"/>
 	<classpathentry kind="lib" path="jars/qtjambi-4.5.2_01.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:platform:/resource/rapidSmith/jars/qtjambi-4.5.2_01-javadoc.jar!/"/>
@@ -33,9 +33,9 @@
 	<classpathentry kind="lib" path="jars/kryo-5.2.1.jar"/>
 	<classpathentry kind="lib" path="jars/minlog-1.3.1.jar"/>
 	<classpathentry kind="lib" path="jars/jython-standalone-2.7.2.jar"/>
-	<classpathentry kind="lib" path="jars/rapidwright-api-lib-2023.1.4.jar">
+	<classpathentry kind="lib" path="jars/rapidwright-api-lib-2023.2.0.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/RapidWright/jars/rapidwright-api-lib-2023.1.4-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:platform:/resource/RapidWright/jars/rapidwright-api-lib-2023.2.0-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/jgrapht-core-1.3.0.jar"/>

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  RAPIDWRIGHT_VERSION: v2023.1.4-beta
+  RAPIDWRIGHT_VERSION: v2023.2.0-beta
 
 jobs:
   build:

LICENSE.TXT

@@ -20,7 +20,7 @@ for details)
 
 RapidWright (Apache 2.0)
  - JOpt Simple (MIT License)
- - Protocol Buffers 3.11.4 (Protocol Buffer License)
+ - Protocol Buffers 3.25.0 (Protocol Buffer License)
  - Kryo 5.2.1 (BSD 3-clause "New" or "Revised" License)
    - MinLog 1.3.1 (BSD 3-clause "New" or "Revised" License)
    - Reflectasm 1.11.9 (BSD 3-clause "New" or "Revised" License)
@@ -429,46 +429,22 @@ IF LICENSEE DOES NOT AGREE TO ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT,
 ************************ END LICENSE ************************
 
 
-************************ Protocol Buffers License ************************
-Components: protobuf 3.11.4
-
+**************************google-protobuf v3.25.0 - BSD-3-Clause***************************
 
 Copyright 2008 Google Inc.  All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it.  This code is not
-standalone and requires a support library to be linked with it.  This
-support library is itself covered by the above license.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+********************************* END LICENSE *********************************
 
-Copyright 2008 Google Inc
-************************ END LICENSE ************************
 
 ************************ Kryo 5.2.1 - BSD 3-clause "New" or "Revised" License ************************
 Components: esotericsoftware-kryo 5

RELEASE_NOTES.TXT

@@ -1,6 +1,44 @@
+============= RapidWright 2023.2.0-beta released on 2023-11-20 ================
+Notes:
+  - SLR Corner updates in device models and handling (#886)
+  - Updates Protobuf to 3.25.0 (#882)
+  - Updates/adds timestamp APIs (#883)
+  - Refactor PROHIBIT constraint for faster Tcl interpretation (#881)
+  - [PerformanceExplorer] Number pblocks by order in file, add first site in dir name (#867)
+  - DesignTools.createMissingSitePinInsts(Design) to ignore GLOBAL_USEDNET (#880)
+  - [RWRoute] Check source & sink pin reaches INT tile for dedicated connections (#878)
+  - ECOTools.createExitSitePinInst() to detect net aliases (#871)
+  - Rewrite RouterHelper.projectOutputPinToINTNode() with fixes (#877)
+  - EDIFNetlist.{generateParentNetMap,getNetAliases}() to be inout-aware (#876)
+  - DesignTools.createMissingSitePinInsts() to cope with net aliases (#875)
+  - Improve TestECOPlacementHelper (#874)
+  - Add com.xilinx.rapidwright.eco.ECOPlacementHelper (#870)
+  - RouteThruHelper to handle SiteInst == null (#866)
+  - Add RouteThruHelper.isRouteThruPIPAvailable(Design, Node, Node) overload (#865)
+  - Add DesignTools.getConnectedBELPins() (#864)
+  - RelocationTools fixes and more robust testing (#863)
+  - Fix TimingAndWirelengthReport.main() (#860)
+  - [Tests] Symlinks to absolute paths (#862)
+  - added check to see if Cell.getLogicalPinMapping() is null (#783)
+  - [DCP] Update tests to infer SitePinInsts (#857)
+  - Replace $(shell ...) with $(wildcard) and $(subst) in Makefile (#856)
+  - Undpreccate Design.createCell()
+  - Special clock flag fix for Versal DCPs
+  - More conservative SitePinInst creation upon DCP load
+
+API Additions:
+  - com.xilinx.rapidwright.design.SitePinInst "public int getConnectedTileWire()"
+  - com.xilinx.rapidwright.device.Device "public int getSiteIndex(String siteName)"
+  - com.xilinx.rapidwright.device.Device "public int getSiteIndex(Site site)"
+  - com.xilinx.rapidwright.device.Device "public Site getSiteByIndex(int siteIndex)"
+  - com.xilinx.rapidwright.device.Device "public Site[] getAllSites()"
+
+API Removals:
+  - com.xilinx.rapidwright.bitstream.ConfigRow "public ConfigRow()"  
+
 ============= RapidWright 2023.1.4-beta released on 2023-10-20 ================
 Notes:
-  -Include RapidWright API Lib Javadoc in Gradle Build (#855)
+  - Include RapidWright API Lib Javadoc in Gradle Build (#855)
   - Add com.xilinx.rapidwright.eco.ECOTools package (#850)
   - More Polynomial Generator improvements (#854)
   - ReportRouteStatusResult.isFullyRouted() to check >0 logical net found (#852)

common.gradle

@@ -36,7 +36,7 @@ dependencies {
   api 'org.capnproto:runtime:0.1.13'
   api 'net.sf.jopt-simple:jopt-simple:5.0.4'
   api 'org.python:jython-standalone:2.7.2'
-  api 'com.google.protobuf:protobuf-java:3.11.4'
+  api 'com.google.protobuf:protobuf-java:3.25.0'
   api 'org.jetbrains:annotations:20.1.0'
   api 'org.zeromq:jeromq:0.5.2'
   api 'commons-cli:commons-cli:1.2'

src/com/xilinx/rapidwright/design/Unisim.java

@@ -33,12 +33,24 @@
 import com.xilinx.rapidwright.edif.EDIFLibrary;
 
 /**
- * Generated on: Wed May 17 23:03:43 2023
+ * Generated on: Fri Oct 20 23:25:44 2023
  * by: com.xilinx.rapidwright.release.UnisimParser
  *
  * Enumerates supported Unisim primitives that map to Xilinx devices.
  */
 public enum Unisim {
+    AIE_ML_NOC_M_AXI,
+    AIE_ML_NOC_M_AXIS,
+    AIE_ML_NOC_S_AXI,
+    AIE_ML_NOC_S_AXIS,
+    AIE_ML_PL_M_AXIS128,
+    AIE_ML_PL_M_AXIS32,
+    AIE_ML_PL_M_AXIS64,
+    AIE_ML_PL_M_EVENTS,
+    AIE_ML_PL_S_AXIS128,
+    AIE_ML_PL_S_AXIS32,
+    AIE_ML_PL_S_AXIS64,
+    AIE_ML_PL_S_EVENTS,
     AIE_NOC_M_AXI,
     AIE_NOC_M_AXIS,
     AIE_NOC_S_AXI,
@@ -144,6 +156,7 @@ public enum Unisim {
     DCM_SP,
     DDRMC,
     DDRMC5,
+    DDRMC5C,
     DDRMC_RIU,
     DFE_CFR,
     DFE_DUC_DDC,
@@ -761,6 +774,7 @@ public enum Unisim {
     NOC2_XBR2X4,
     NOC2_XBR4X2,
     NOC_NCRB,
+    NOC_NCRB_SSIT,
     NOC_NIDB,
     NOC_NMU128,
     NOC_NMU256,
@@ -1275,9 +1289,6 @@ public enum Unisim {
     RAMS64E5,
     RFADC,
     RFADC_13B4W_M0,
-    RFADC_13B4W_M1,
-    RFADC_14B2W_M0,
-    RFADC_14B2W_M1,
     RFDAC,
     RIU_OR,
     ROM128X1,
@@ -1323,6 +1334,7 @@ public enum Unisim {
     USR_ACCESS_VIRTEX6,
     VCC,
     VCU,
+    VDU,
     X5PHIO_CMUIF,
     X5PHIO_CMU_X32,
     X5PHIO_DCCINVBUF,

src/com/xilinx/rapidwright/device/FamilyType.java

@@ -27,7 +27,7 @@
 
 
 /**
- * Generated on: Wed May 17 22:32:37 2023
+ * Generated on: Fri Oct 20 21:29:57 2023
  * by: com.xilinx.rapidwright.release.PartNamePopulator
  *
  * Set of all Supported Xilinx families in RapidWright
@@ -54,6 +54,7 @@ public enum FamilyType {
         QRKINTEXU,
         QRVERSALAICORE,
         QVERSALAICORE,
+        QVERSALPREMIUM,
         QVERSALPRIME,
         QVIRTEX7,
         QVIRTEXUPLUS,

src/com/xilinx/rapidwright/device/Part.java

@@ -30,7 +30,7 @@
 import java.util.HashSet;
 
 /**
- * Generated on: Wed May 17 22:32:37 2023
+ * Generated on: Fri Oct 20 21:29:57 2023
  * by: com.xilinx.rapidwright.release.PartNamePopulator
  *
  * Class used to uniquely represent a Xilinx part.
@@ -261,6 +261,7 @@ public Series getSeries() {
         versalTypes = new FamilyType[] {
                 FamilyType.QRVERSALAICORE,
                 FamilyType.QVERSALAICORE,
+                FamilyType.QVERSALPREMIUM,
                 FamilyType.QVERSALPRIME,
                 FamilyType.VERSAL,
                 FamilyType.VERSALAICORE,

src/com/xilinx/rapidwright/device/PartNameTools.java

@@ -36,7 +36,7 @@
 import com.xilinx.rapidwright.util.FileTools;
 
 /**
- * Generated on: Wed May 17 22:32:37 2023
+ * Generated on: Fri Oct 20 21:29:57 2023
  * by: com.xilinx.rapidwright.release.PartNamePopulator
  *
  * Class to hold utility APIs dealing with Parts and device names.
@@ -146,6 +146,7 @@ public static FamilyType getArchitectureFromFamilyType(FamilyType type) {
             case QRKINTEXU: return FamilyType.KINTEXU;
             case QRVERSALAICORE: return FamilyType.VERSAL;
             case QVERSALAICORE: return FamilyType.VERSAL;
+            case QVERSALPREMIUM: return FamilyType.VERSAL;
             case QVERSALPRIME: return FamilyType.VERSAL;
             case QVIRTEX7: return FamilyType.VIRTEX7;
             case QVIRTEXUPLUS: return FamilyType.VIRTEXUPLUS;
@@ -199,6 +200,7 @@ public static String getFullArchitectureName(FamilyType type) {
             case QRKINTEXU: return "Kintex UltraScale";
             case QRVERSALAICORE: return "Versal ACAP";
             case QVERSALAICORE: return "Versal ACAP";
+            case QVERSALPREMIUM: return "Versal ACAP";
             case QVERSALPRIME: return "Versal ACAP";
             case QVIRTEX7: return "Virtex-7";
             case QVIRTEXUPLUS: return "Virtex UltraScale+";
@@ -253,6 +255,7 @@ public static Series getSeriesFromFamilyType(FamilyType type) {
             case QRKINTEXU: return Series.UltraScale;
             case QRVERSALAICORE: return Series.Versal;
             case QVERSALAICORE: return Series.Versal;
+            case QVERSALPREMIUM: return Series.Versal;
             case QVERSALPRIME: return Series.Versal;
             case QVIRTEX7: return Series.Series7;
             case QVIRTEXUPLUS: return Series.UltraScalePlus;

src/com/xilinx/rapidwright/device/TileTypeEnum.java

@@ -27,7 +27,7 @@
 
 
 /**
- * Generated on: Wed May 17 23:03:43 2023
+ * Generated on: Fri Oct 20 23:25:44 2023
  * by: com.xilinx.rapidwright.release.SiteAndTileTypeUpdater
  *
  * Enumeration of TileTypeEnum type for all valid devices within Vivado.
@@ -806,6 +806,7 @@ public enum TileTypeEnum {
     HPIO_CFG_TERM_L_TOP_FT,
     HPIO_CFG_TOP_TERM_R,
     HPIO_CFG_TOP_TERM_R_GTH,
+    HPIO_GTH_QUAD_RIGHT_RBRK_FT,
     HPIO_HPIO_LEFT_TERM_B_L_FT,
     HPIO_HPIO_LEFT_TERM_P_FT,
     HPIO_HPIO_LEFT_TERM_T_L_FT,
@@ -837,6 +838,7 @@ public enum TileTypeEnum {
     HPIO_TERM_L_TERM_T_FT,
     HPIO_TERM_R_GTH_RBRK,
     HPIO_TERM_R_GTH_TERM_B,
+    HPIO_TERM_R_GTH_TERM_T_FT,
     HPIO_TERM_R_RBRK,
     HPIO_TERM_R_TERM_B,
     HPIO_TERM_R_TERM_T,