Avoid asking for the size of the machine after configuring for no drop

Author: rowleya

SpiNNaker-comms/src/main/java/uk/ac/manchester/spinnaker/protocols/FastDataIn.java

@@ -97,10 +97,6 @@ public class FastDataIn implements AutoCloseable {
 	/** Sequence number that marks the end of a sequence number stream. */
 	private static final int MISSING_SEQS_END = -1;
 
-	private final int maxChipX;
-
-	private final int maxChipY;
-
 	private final HasCoreLocation gathererCore;
 
 	private final ThrottledConnection connection;
@@ -130,13 +126,11 @@ public class FastDataIn implements AutoCloseable {
 	 */
 	@MustBeClosed
 	@SuppressWarnings("MustBeClosed")
-	public FastDataIn(int maxChipX, int maxChipY, CoreLocation gathererCore,
+	public FastDataIn(CoreLocation gathererCore,
 			TransceiverInterface transceiver, ChipLocation ethernetChip,
 			String ethernetAddress, IPTag iptag)
 					throws ProcessException, IOException, InterruptedException {
 		this.gathererCore = gathererCore;
-		this.maxChipX = maxChipX;
-		this.maxChipY = maxChipY;
 		this.connection = new ThrottledConnection(transceiver, ethernetChip,
 				ethernetAddress, iptag);
 	}
@@ -146,19 +140,6 @@ public void close() throws IOException {
 		connection.close();
 	}
 
-	private HasChipLocation getBoardLocalDestination(
-			HasChipLocation monitorChip) {
-		int boardLocalX = monitorChip.getX() - gathererCore.getX();
-		if (boardLocalX < 0) {
-			boardLocalX += maxChipX + 1;
-		}
-		int boardLocalY = monitorChip.getY() - gathererCore.getY();
-		if (boardLocalY < 0) {
-			boardLocalY += maxChipY + 1;
-		}
-		return new ChipLocation(boardLocalX, boardLocalY);
-	}
-
 	/**
 	 * Write data to a given memory location.
 	 *
@@ -173,7 +154,7 @@ private HasChipLocation getBoardLocalDestination(
 	 * @throws InterruptedException
 	 *            If communications are interrupted.
 	 */
-	public void fastWrite(HasChipLocation destination,
+	public void fastWrite(HasChipLocation boardLocalDestination,
 			MemoryLocation baseAddress, ByteBuffer data)
 					throws IOException, InterruptedException {
 		int timeoutCount = 0;
@@ -182,7 +163,7 @@ public void fastWrite(HasChipLocation destination,
 
 		outerLoop: while (true) {
 			// Do the initial blast of data
-			sendInitialPackets(getBoardLocalDestination(destination),
+			sendInitialPackets(boardLocalDestination,
 					baseAddress, data, transactionId, numPackets);
 			/*
 			 * Don't create a missing buffer until at least one packet has

SpiNNaker-comms/src/main/java/uk/ac/manchester/spinnaker/transceiver/Transceiver.java

@@ -2640,16 +2640,15 @@ public void loadSystemRouterTables(CoreSubsets monitorCores)
 	@Override
 	@SuppressWarnings("MustBeClosed")
 	public void writeMemoryFast(CoreLocation gathererCore,
-			ChipLocation ethernetChip, String ethernetAddress, IPTag iptag,
-			HasChipLocation chip, MemoryLocation baseAddress, ByteBuffer data)
+			ChipLocation ethernetChip,
+			String ethernetAddress, IPTag iptag, HasChipLocation chip,
+			MemoryLocation baseAddress, ByteBuffer data)
 			throws IOException, ProcessException, InterruptedException {
 		FastDataIn controller = null;
 		synchronized (cachedDataIn) {
 			if (!cachedDataIn.containsKey(ethernetChip)) {
-				var dims = getMachineDimensions();
 				cachedDataIn.put(ethernetChip,
-						new FastDataIn(dims.width + 1, dims.height + 1,
-								gathererCore, this, ethernetChip,
+						new FastDataIn(gathererCore, this, ethernetChip,
 								ethernetAddress, iptag));
 			}
 			controller = cachedDataIn.get(ethernetChip);

SpiNNaker-front-end/src/main/java/uk/ac/manchester/spinnaker/front_end/dse/BoardWorker.java

@@ -26,6 +26,7 @@
 import java.util.LinkedHashMap;
 
 import uk.ac.manchester.spinnaker.machine.HasCoreLocation;
+import uk.ac.manchester.spinnaker.machine.MachineDimensions;
 import uk.ac.manchester.spinnaker.machine.MemoryLocation;
 import uk.ac.manchester.spinnaker.messages.model.AppID;
 import uk.ac.manchester.spinnaker.storage.DSEStorage;
@@ -48,6 +49,9 @@ abstract class BoardWorker {
 	/** The system wide app id.*/
 	private final int appId;
 
+	/** The dimensions of the machine.*/
+	protected final MachineDimensions machineDimensions;
+
 	/** Application data magic number. */
 	private static final int APPDATA_MAGIC_NUM = 0xAD130AD6;
 
@@ -100,6 +104,7 @@ protected BoardWorker(TransceiverInterface txrx, Ethernet board,
 		this.board = board;
 		this.storage = storage;
 		this.appId = storage.getAppId();
+		this.machineDimensions = storage.getMachineDimensions();
 		this.txrx = txrx;
 	}
 

SpiNNaker-front-end/src/main/java/uk/ac/manchester/spinnaker/front_end/dse/FastExecuteDataSpecification.java

@@ -34,6 +34,7 @@
 import uk.ac.manchester.spinnaker.front_end.download.request.Monitor;
 import uk.ac.manchester.spinnaker.machine.ChipLocation;
 import uk.ac.manchester.spinnaker.machine.CoreSubsets;
+import uk.ac.manchester.spinnaker.machine.HasChipLocation;
 import uk.ac.manchester.spinnaker.machine.HasCoreLocation;
 import uk.ac.manchester.spinnaker.machine.Machine;
 import uk.ac.manchester.spinnaker.machine.MemoryLocation;
@@ -221,14 +222,27 @@ private class FastBoardWorker extends BoardWorker {
 			this.gather = gather;
 		}
 
+		private HasChipLocation getBoardLocalDestination(
+				HasChipLocation monitorChip) {
+			int boardLocalX = monitorChip.getX() - gather.getX();
+			if (boardLocalX < 0) {
+				boardLocalX += machineDimensions.width;
+			}
+			int boardLocalY = monitorChip.getY() - gather.getY();
+			if (boardLocalY < 0) {
+				boardLocalY += machineDimensions.height;
+			}
+			return new ChipLocation(boardLocalX, boardLocalY);
+		}
+
 		@Override
 		protected int writeRegion(HasCoreLocation core, ByteBuffer content,
 				MemoryLocation baseAddress)
 				throws IOException, ProcessException, InterruptedException {
 			int toWrite = content.remaining();
 			txrx.writeMemoryFast(gather.asCoreLocation(), board.location,
-					board.ethernetAddress, gather.getIptag(), core, baseAddress,
-					content);
+					board.ethernetAddress, gather.getIptag(),
+					getBoardLocalDestination(core), baseAddress, content);
 			return toWrite;
 		}
 	}

SpiNNaker-storage/src/main/java/uk/ac/manchester/spinnaker/storage/DSEStorage.java

@@ -23,6 +23,7 @@
 
 import uk.ac.manchester.spinnaker.machine.ChipLocation;
 import uk.ac.manchester.spinnaker.machine.CoreLocation;
+import uk.ac.manchester.spinnaker.machine.MachineDimensions;
 import uk.ac.manchester.spinnaker.machine.MemoryLocation;
 import uk.ac.manchester.spinnaker.utils.validation.IPAddress;
 
@@ -103,6 +104,14 @@ void setStartAddress(CoreLocation xyp, MemoryLocation start)
 	 */
 	int getAppId() throws StorageException;
 
+	/**
+	 * Get the machine dimensions.
+	 *
+	 * @return The machine dimensions.
+	 * @throws StorageException If the database access fails.
+	 */
+	MachineDimensions getMachineDimensions() throws StorageException;
+
 	/**
 	 * Set the pointer for where to write the region data to.
 	 *

SpiNNaker-storage/src/main/java/uk/ac/manchester/spinnaker/storage/sqlite/SQL.java

@@ -258,8 +258,10 @@ private SQL() {
 	/** Get the app_id. */
 	@ResultColumn("app_id")
 	static final String GET_APP_ID =
-			"SELECT app_id "
-					+ "FROM app_id ";
+			"SELECT app_id FROM info";
+
+	static final String GET_MACHINE_DIMENSIONS =
+			"SELECT width, height FROM info";
 
 	/**
 	 * The name of the result containing the spalloc URI.

SpiNNaker-storage/src/main/java/uk/ac/manchester/spinnaker/storage/sqlite/SQLiteDataSpecStorage.java

@@ -25,9 +25,11 @@
 import java.util.List;
 
 import uk.ac.manchester.spinnaker.machine.CoreLocation;
+import uk.ac.manchester.spinnaker.machine.MachineDimensions;
 import uk.ac.manchester.spinnaker.machine.MemoryLocation;
 
 import static uk.ac.manchester.spinnaker.storage.sqlite.SQL.GET_APP_ID;
+import static uk.ac.manchester.spinnaker.storage.sqlite.SQL.GET_MACHINE_DIMENSIONS;
 import static uk.ac.manchester.spinnaker.storage.sqlite.SQL.GET_REGION_POINTER_AND_CONTEXT;
 import static uk.ac.manchester.spinnaker.storage.sqlite.SQL.GET_REGION_SIZES;
 import static uk.ac.manchester.spinnaker.storage.sqlite.SQL.GET_START_ADDRESS;
@@ -239,6 +241,25 @@ private int getAppId(Connection conn)
 		throw new IllegalStateException("could not ge app id");
 	}
 
+	@Override
+	public MachineDimensions getMachineDimensions() throws StorageException {
+		return callR(conn -> getMachineDimensions(conn),
+				"getting machine dimensions");
+	}
+
+	private MachineDimensions getMachineDimensions(Connection conn)
+			throws SQLException {
+		try (var s = conn.prepareStatement(GET_MACHINE_DIMENSIONS)) {
+			try (var rs = s.executeQuery()) {
+				while (rs.next()) {
+					return new MachineDimensions(rs.getInt("width"),
+							rs.getInt("height"));
+				}
+			}
+		}
+		throw new IllegalStateException("could not get machine dimensions");
+	}
+
 	private static final class EthernetImpl extends Ethernet {
 		private EthernetImpl(int etherx, int ethery, String addr) {
 			super(etherx, ethery, addr);