Fixing chronic misspelling of indices

clavin-xlnx · clavin-xlnx · commit 471b8ac67b9f · 2025-11-13T12:26:13.000-07:00
Signed-off-by: Chris Lavin &lt;chris.lavin@amd.com&gt;
diff --git a/src/com/xilinx/rapidwright/device/helper/TileColumnPattern.java b/src/com/xilinx/rapidwright/device/helper/TileColumnPattern.java
@@ -86,7 +86,7 @@ public static TileColumnPattern createTileColumnPattern(List<TileTypeEnum> types
 
     /**
      * Creates a TileColumnPattern from an existing list of tile types and uses the start and end
-     * as indicies to get a sublist of filteredTypes.
+     * as indices to get a sublist of filteredTypes.
      * @param filteredTypes The list of tile types to turn into a pattern
      * @param start The start index to use to build a subList of filteredTypes
      * @param end The end index to use to build a subList of filteredTypes
diff --git a/src/com/xilinx/rapidwright/edif/EDIFPort.java b/src/com/xilinx/rapidwright/edif/EDIFPort.java
@@ -108,7 +108,7 @@ else if (c == '[') {
             }
         }
         if (colonIdx == -1 || leftBracket == -1) {
-            throw new RuntimeException("ERROR: Interpreting port " + getName() + ", couldn't identify indicies.");
+            throw new RuntimeException("ERROR: Interpreting port " + getName() + ", couldn't identify indices.");
         }
 
         int left = Integer.parseInt(name.substring(leftBracket+1, colonIdx));
diff --git a/src/com/xilinx/rapidwright/edif/EDIFTools.java b/src/com/xilinx/rapidwright/edif/EDIFTools.java
@@ -475,7 +475,7 @@ else if (c == '[') {
             }
         }
         if (colonIdx == -1 || leftBracket == -1) {
-            throw new RuntimeException("ERROR: Interpreting port " + name + ", couldn't identify indicies.");
+            throw new RuntimeException("ERROR: Interpreting port " + name + ", couldn't identify indices.");
         }
 
         int left = Integer.parseInt(name.substring(leftBracket+1, colonIdx));
@@ -1736,15 +1736,15 @@ public static EDIFNetlist createFlatNetlist(EDIFNetlist netlist, String partName
         for (EDIFPort topPort : netlist.getTopCell().getPorts()) {
             EDIFPort flatPort = flatTop.createPort(topPort);
             if (flatPort.isBus()) {
-                int[] indicies = flatPort.getBitBlastedIndices();
+                int[] indices = flatPort.getBitBlastedIndices();
                 int i = 0;
                 for (EDIFNet net : topPort.getInternalNets()) {
                     if (net == null) continue;
                     EDIFNet flatNet = flatTop.getNet(net.getName());
                     if (flatNet == null) {
                         flatNet = flatTop.createNet(net.getName());
                     }
-                    flatNet.createPortInst(flatPort, indicies[i++]);
+                    flatNet.createPortInst(flatPort, indices[i++]);
                 }
             } else {
                 EDIFNet net = topPort.getInternalNet();
diff --git a/src/com/xilinx/rapidwright/interchange/DeviceResourcesVerifier.java b/src/com/xilinx/rapidwright/interchange/DeviceResourcesVerifier.java
@@ -189,7 +189,7 @@ public static boolean verifyDeviceResources(String devResFileName, String device
 
         Reader<SiteType.Reader> stReaders = dReader.getSiteTypeList();
         for (SiteType.Reader stReader : stReaders) {
-            Set<Integer> belPinIndicies = new HashSet<Integer>();
+            Set<Integer> belPinIndices = new HashSet<Integer>();
             SiteTypeEnum siteTypeEnum = SiteTypeEnum.valueOf(allStrings.get(stReader.getName()));
 
             Site site = siteTypes.get(siteTypeEnum);
@@ -212,7 +212,7 @@ public static boolean verifyDeviceResources(String devResFileName, String device
                 for (int j=0; j < belPins.length; j++) {
                     BELPin pin = belPins[j];
                     int belPinIndex = pinsReader.get(j);
-                    belPinIndicies.add(belPinIndex);
+                    belPinIndices.add(belPinIndex);
                     verifyBelPin(belPinsReader, pin, belPinIndex);
                 }
 
@@ -223,11 +223,11 @@ public static boolean verifyDeviceResources(String devResFileName, String device
                     BELInverter.Reader belInverter = belReader.getInverting();
 
                     BELPin nonInverting = bel.getNonInvertingPin();
-                    belPinIndicies.add(belInverter.getNonInvertingPin());
+                    belPinIndices.add(belInverter.getNonInvertingPin());
                     verifyBelPin(belPinsReader, nonInverting, belInverter.getNonInvertingPin());
 
                     BELPin inverting = bel.getInvertingPin();
-                    belPinIndicies.add(belInverter.getInvertingPin());
+                    belPinIndices.add(belInverter.getInvertingPin());
                     verifyBelPin(belPinsReader, inverting, belInverter.getInvertingPin());
                 } else {
                     expect(false, belReader.hasInverting());
@@ -274,7 +274,7 @@ public static boolean verifyDeviceResources(String devResFileName, String device
                 }
 
                 BELPin belPin = belPins[0];
-                belPinIndicies.add(pinReader.getBelpin());
+                belPinIndices.add(pinReader.getBelpin());
                 verifyBelPin(belPinsReader, belPin, pinReader.getBelpin());
             }
 
@@ -297,12 +297,12 @@ public static boolean verifyDeviceResources(String devResFileName, String device
                 expect(belPins.length, wiresReader.size());
 
                 for (int i=0; i < belPins.length; i++) {
-                    belPinIndicies.add(wiresReader.get(i));
+                    belPinIndices.add(wiresReader.get(i));
                     verifyBelPin(belPinsReader, belPins[i], wiresReader.get(i));
                 }
             }
 
-            expect(belPinIndicies.size(), belPinsReader.size());
+            expect(belPinIndices.size(), belPinsReader.size());
 
             StructList.Reader<DeviceResources.Device.SitePIP.Reader> sitePipsReader = stReader.getSitePIPs();
             SitePIP[] sitePIPs = siteInst.getSitePIPs();
diff --git a/src/com/xilinx/rapidwright/interchange/DeviceResourcesWriter.java b/src/com/xilinx/rapidwright/interchange/DeviceResourcesWriter.java
@@ -288,14 +288,14 @@ public static void writeDeviceResourcesFile(String part, Device device, CodePerf
         writeAllSiteTypesToBuilder(design, device, devBuilder);
 
         t.stop().start("TileTypes");
-        Map<TileTypeEnum, Integer> tileTypeIndicies = writeAllTileTypesToBuilder(design, device, devBuilder);
+        Map<TileTypeEnum, Integer> tileTypeIndices = writeAllTileTypesToBuilder(design, device, devBuilder);
         Map<TileTypeEnum, TileType.Builder> tileTypesObj = new HashMap<TileTypeEnum, TileType.Builder>();
-        for (Map.Entry<TileTypeEnum, Integer> tileType : tileTypeIndicies.entrySet()) {
+        for (Map.Entry<TileTypeEnum, Integer> tileType : tileTypeIndices.entrySet()) {
             tileTypesObj.put(tileType.getKey(), devBuilder.getTileTypeList().get(tileType.getValue()));
         }
 
         t.stop().start("Tiles");
-        writeAllTilesToBuilder(device, devBuilder, tileTypeIndicies);
+        writeAllTilesToBuilder(device, devBuilder, tileTypeIndices);
 
         t.stop().start("Wires&Nodes");
         writeAllWiresAndNodesToBuilder(device, devBuilder, skipRouteResources);
@@ -696,7 +696,7 @@ private static void populateAltSitePins(
     public static Map<TileTypeEnum, Integer> writeAllTileTypesToBuilder(Design design, Device device, DeviceResources.Device.Builder devBuilder) {
         StructList.Builder<TileType.Builder> tileTypesList = devBuilder.initTileTypeList(tileTypes.size());
 
-        Map<TileTypeEnum, Integer> tileTypeIndicies = new HashMap<TileTypeEnum, Integer>();
+        Map<TileTypeEnum, Integer> tileTypeIndices = new HashMap<TileTypeEnum, Integer>();
 
         // Order tile types by their TILE_TYPE_IDX (may not be contiguous)
         Map<Integer, TileTypeEnum> tileTypeIndexMap = new TreeMap<>();
@@ -709,7 +709,7 @@ public static Map<TileTypeEnum, Integer> writeAllTileTypesToBuilder(Design desig
             TileTypeEnum type = e.getValue();
             Tile tile = tileTypes.get(type);
             TileType.Builder tileType = tileTypesList.get(i);
-            tileTypeIndicies.put(type, i);
+            tileTypeIndices.put(type, i);
             // name
             tileType.setName(allStrings.getIndex(type.name()));
 
@@ -792,10 +792,10 @@ public static Map<TileTypeEnum, Integer> writeAllTileTypesToBuilder(Design desig
             i++;
         }
 
-        return tileTypeIndicies;
+        return tileTypeIndices;
     }
 
-    public static void writeAllTilesToBuilder(Device device, DeviceResources.Device.Builder devBuilder, Map<TileTypeEnum, Integer> tileTypeIndicies) {
+    public static void writeAllTilesToBuilder(Device device, DeviceResources.Device.Builder devBuilder, Map<TileTypeEnum, Integer> tileTypeIndices) {
         StructList.Builder<DeviceResources.Device.Tile.Builder> tileBuilders =
                 devBuilder.initTileList(device.getColumns() * device.getRows());
 
@@ -804,7 +804,7 @@ public static void writeAllTilesToBuilder(Device device, DeviceResources.Device.
             for (Tile tile : tiles) {
                 DeviceResources.Device.Tile.Builder tileBuilder = tileBuilders.get(i);
                 tileBuilder.setName(allStrings.getIndex(tile.getName()));
-                tileBuilder.setType(tileTypeIndicies.get(tile.getTileTypeEnum()));
+                tileBuilder.setType(tileTypeIndices.get(tile.getTileTypeEnum()));
                 Site[] sites = tile.getSites();
                 StructList.Builder<DeviceResources.Device.Site.Builder> siteBuilders = tileBuilder
                         .initSites(sites.length);

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ else if (c == '[') {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`if (colonIdx == -1 \|\| leftBracket == -1) {`
`111`		`- throw new RuntimeException("ERROR: Interpreting port " + getName() + ", couldn't identify indicies.");`
	`111`	`+ throw new RuntimeException("ERROR: Interpreting port " + getName() + ", couldn't identify indices.");`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`int left = Integer.parseInt(name.substring(leftBracket+1, colonIdx));`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ else if (c == '[') {`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`	`if (colonIdx == -1 \|\| leftBracket == -1) {`
`478`		`- throw new RuntimeException("ERROR: Interpreting port " + name + ", couldn't identify indicies.");`
	`478`	`+ throw new RuntimeException("ERROR: Interpreting port " + name + ", couldn't identify indices.");`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`int left = Integer.parseInt(name.substring(leftBracket+1, colonIdx));`
`@@ -1736,15 +1736,15 @@ public static EDIFNetlist createFlatNetlist(EDIFNetlist netlist, String partName`
`1736`	`1736`	`for (EDIFPort topPort : netlist.getTopCell().getPorts()) {`
`1737`	`1737`	`EDIFPort flatPort = flatTop.createPort(topPort);`
`1738`	`1738`	`if (flatPort.isBus()) {`
`1739`		`- int[] indicies = flatPort.getBitBlastedIndices();`
	`1739`	`+ int[] indices = flatPort.getBitBlastedIndices();`
`1740`	`1740`	`int i = 0;`
`1741`	`1741`	`for (EDIFNet net : topPort.getInternalNets()) {`
`1742`	`1742`	`if (net == null) continue;`
`1743`	`1743`	`EDIFNet flatNet = flatTop.getNet(net.getName());`
`1744`	`1744`	`if (flatNet == null) {`
`1745`	`1745`	`flatNet = flatTop.createNet(net.getName());`
`1746`	`1746`	`}`
`1747`		`- flatNet.createPortInst(flatPort, indicies[i++]);`
	`1747`	`+ flatNet.createPortInst(flatPort, indices[i++]);`
`1748`	`1748`	`}`
`1749`	`1749`	`} else {`
`1750`	`1750`	`EDIFNet net = topPort.getInternalNet();`