starting with auto-tester

Makefile

@@ -17,11 +17,17 @@ LDLIBS += `pkg-config libxml-2.0 --libs`
 
 MODEL_OBJ = model_main.o model_tiles.o model_devices.o model_ports.o model_conns.o model_switches.o model_helper.o
 
-all: bit2txt draw_svg_tiles new_fp hstrrep sort_seq merge_seq
+all: autotest bit2txt draw_svg_tiles new_fp hstrrep sort_seq merge_seq
 
-new_fp: new_fp.o $(MODEL_OBJ) helper.o
+autotest: autotest.o $(MODEL_OBJ) floorplan.o control.o helper.o
 
-new_fp.o: new_fp.c model.h helper.h
+new_fp: new_fp.o $(MODEL_OBJ) floorplan.o helper.o
+
+new_fp.o: new_fp.c floorplan.h model.h helper.h
+
+floorplan.o: floorplan.c floorplan.h
+
+control.o: control.c control.h
 
 draw_svg_tiles: draw_svg_tiles.o $(MODEL_OBJ) helper.o
 
@@ -110,6 +116,7 @@ clean:
 		helper.o $(MODEL_OBJ) hstrrep hstrrep.o \
 		sort_seq sort_seq.o \
 		merge_seq merge_seq.o \
+		autotest.o control.o floorplan.o \
 		xc6slx9_empty.fp xc6slx9.svg \
 		xc6slx9_empty.tiles xc6slx9_empty.devices xc6slx9_empty.conns \
 		xc6slx9_empty.ports xc6slx9_empty.sw xc6slx9_empty.nets \

README

@@ -13,8 +13,7 @@ Libraries
 - libfpga-model      memory-only representation of an FPGA
 - libfpga-bits       reads and writes .bit bitstream files
 - libfpga-floorplan  reads and writes .fp floorplan files
-- libfpga-control    builds on top of libfpga-model to give
+- libfpga-control    programmatic access to libfpga-model
-                     programmatic access to the model
 - libfpga-test       test harness for libfpga-model and libfpga-control
 
 Utilities

autotest.c

@@ -18,6 +18,12 @@ int main(int argc, char** argv)
 			XC6SLX9_LEFT_WIRING, XC6SLX9_RIGHT_WIRING)))
 		goto fail;
 
+	// inform about progress over stdout
+
+	// pick 2 input IOBs, one output IOB and configure them
+	// pick 1 logic block and configure
+	// printf floorplan
+
 	return EXIT_SUCCESS;
 fail:
 	return rc;

floorplan.c

@@ -8,6 +8,11 @@
 #include "model.h"
 #include "floorplan.h"
 
+void printf_version(void)
+{
+	printf("fpga_floorplan_format 1\n");
+}
+
 #define PRINT_FLAG(f)	if (tf & f) { printf (" %s", #f); tf &= ~f; }
 
 int printf_tiles(struct fpga_model* model)

floorplan.h

@@ -5,6 +5,26 @@
 // For details see the UNLICENSE file at the root of the source tree.
 //
 
+//
+// Design principles of a floorplan file
+//
+// What needs to be in the file:
+// - all devices, configuration for each device
+//   probably multiple lines that are adding config strings
+// - wires maybe separately, and/or as named connection points
+//   in tiles?
+// - connection pairs that can be enabled/disabled
+// - global flags and configuration registers
+// - the static data should be optional (unused conn pairs,
+//   unused devices, wires)
+//
+// - each line should be in the global namespace, line order
+//   should not matter
+// - file should be easily parsable with bison
+// - lines should typically not exceed 80 characters
+//
+
+void printf_version(void);
 int printf_tiles(struct fpga_model* model);
 int printf_devices(struct fpga_model* model);
 int printf_ports(struct fpga_model* model);

model.h

@@ -11,7 +11,6 @@
 #include <stdint.h>
 #include <assert.h>
 #include <sys/stat.h>
-#define MACRO_STR(arg)	#arg
 
 #include "helper.h"
 

new_fp.c

@@ -5,22 +5,8 @@
 // For details see the UNLICENSE file at the root of the source tree.
 //
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <assert.h>
-#include <sys/stat.h>
-
 #include "model.h"
-
+#include "floorplan.h"
-#define PRINT_FLAG(f)	if (tf & f) { printf (" %s", #f); tf &= ~f; }
-
-int printf_tiles(struct fpga_model* model);
-int printf_devices(struct fpga_model* model);
-int printf_ports(struct fpga_model* model);
-int printf_conns(struct fpga_model* model);
-int printf_switches(struct fpga_model* model);
 
 int main(int argc, char** argv)
 {
@@ -35,24 +21,7 @@ int main(int argc, char** argv)
 	if (argc > 1 && !strcmp(argv[1], "--no-conns"))
 		no_conns = 1;
 
-	printf("fpga_floorplan_format 1\n");
+	printf_version();
-
-	//
-	// What needs to be in the file:
-	// - all devices, configuration for each device
-	//   probably multiple lines that are adding config strings
-	// - wires maybe separately, and/or as named connection points
-	//   in tiles?
-	// - connection pairs that can be enabled/disabled
-	// - global flags and configuration registers
-	// - the static data should be optional (unused conn pairs,
-	//   unused devices, wires)
-	//
-	// - each line should be in the global namespace, line order
-	//   should not matter
-	// - file should be easily parsable with bison
-	// - lines should typically not exceed 80 characters
-	//
 
 	rc = printf_tiles(&model);
 	if (rc) goto fail;
@@ -75,281 +44,3 @@ int main(int argc, char** argv)
 fail:
 	return rc;
 }
-
-int printf_tiles(struct fpga_model* model)
-{
-	struct fpga_tile* tile;
-	int x, y;
-
-	for (x = 0; x < model->x_width; x++) {
-		printf("\n");
-		for (y = 0; y < model->y_height; y++) {
-			tile = &model->tiles[y*model->x_width + x];
-
-			if (tile->type != NA)
-				printf("tile y%02i x%02i name %s\n", y, x,
-					fpga_tiletype_str(tile->type));
-			if (tile->flags) {
-				int tf = tile->flags;
-				printf("tile y%02i x%02i flags", y, x);
-
-				PRINT_FLAG(TF_LOGIC_XL_DEV);
-				PRINT_FLAG(TF_LOGIC_XM_DEV);
-				PRINT_FLAG(TF_IOLOGIC_DELAY_DEV);
-				PRINT_FLAG(TF_FABRIC_ROUTING_COL);
-				PRINT_FLAG(TF_FABRIC_LOGIC_COL);
-				PRINT_FLAG(TF_FABRIC_BRAM_COL);
-				PRINT_FLAG(TF_FABRIC_MACC_COL);
-				PRINT_FLAG(TF_BRAM_DEV);
-				PRINT_FLAG(TF_MACC_DEV);
-				PRINT_FLAG(TF_LOGIC_XL_DEV);
-				PRINT_FLAG(TF_LOGIC_XM_DEV);
-				PRINT_FLAG(TF_IOLOGIC_DELAY_DEV);
-				PRINT_FLAG(TF_DCM_DEV);
-				PRINT_FLAG(TF_PLL_DEV);
-				PRINT_FLAG(TF_WIRED);
-
-				if (tf) printf(" 0x%x", tf);
-				printf("\n");
-			}
-		}
-	}
-	return 0;
-}
-
-int printf_devices(struct fpga_model* model)
-{
-	int x, y, i;
-	struct fpga_tile* tile;
-
-	for (x = 0; x < model->x_width; x++) {
-		for (y = 0; y < model->y_height; y++) {
-			tile = YX_TILE(model, y, x);
-			for (i = 0; i < tile->num_devices; i++) {
-				switch (tile->devices[i].type) {
-					case DEV_LOGIC_M:
-						printf("device y%02i x%02i SLICEM\n", y, x);
-						break;
-					case DEV_LOGIC_L:
-						printf("device y%02i x%02i SLICEL\n", y, x);
-						break;
-					case DEV_LOGIC_X:
-						printf("device y%02i x%02i SLICEX\n", y, x);
-						break;
-					case DEV_MACC:
-						printf("device y%02i x%02i DSP48A1\n", y, x);
-						break;
-					case DEV_TIEOFF:
-						printf("device y%02i x%02i TIEOFF\n", y, x);
-						break;
-					case DEV_IOBM:
-						printf("device y%02i x%02i IOBM\n", y, x);
-						break;
-					case DEV_IOBS:
-						printf("device y%02i x%02i IOBS\n", y, x);
-						break;
-					case DEV_ILOGIC:
-						printf("device y%02i x%02i ILOGIC2\n", y, x);
-						break;
-					case DEV_OLOGIC:
-						printf("device y%02i x%02i OLOGIC2\n", y, x);
-						break;
-					case DEV_IODELAY:
-						printf("device y%02i x%02i IODELAY2\n", y, x);
-						break;
-					case DEV_BRAM16:
-						printf("device y%02i x%02i RAMB16BWER\n", y, x);
-						break;
-					case DEV_BRAM8:
-						printf("device y%02i x%02i RAMB8BWER\n", y, x);
-						break;
-					case DEV_BUFH:
-						printf("device y%02i x%02i BUFH\n", y, x);
-						break;
-					case DEV_BUFIO:
-						printf("device y%02i x%02i BUFIO2\n", y, x);
-						break;
-					case DEV_BUFIO_FB:
-						printf("device y%02i x%02i BUFIO2FB\n", y, x);
-						break;
-					case DEV_BUFPLL:
-						printf("device y%02i x%02i BUFPLL\n", y, x);
-						break;
-					case DEV_BUFPLL_MCB:
-						printf("device y%02i x%02i BUFPLL_MCB\n", y, x);
-						break;
-					case DEV_BUFGMUX:
-						printf("device y%02i x%02i BUFGMUX\n", y, x);
-						break;
-					case DEV_BSCAN:
-						printf("device y%02i x%02i BSCAN\n", y, x);
-						break;
-					case DEV_DCM:
-						printf("device y%02i x%02i DCM\n", y, x);
-						break;
-					case DEV_PLL:
-						printf("device y%02i x%02i PLL\n", y, x);
-						break;
-					case DEV_ICAP:
-						printf("device y%02i x%02i ICAP\n", y, x);
-						break;
-					case DEV_POST_CRC_INTERNAL:
-						printf("device y%02i x%02i POST_CRC_INTERNAL\n", y, x);
-						break;
-					case DEV_STARTUP:
-						printf("device y%02i x%02i STARTUP\n", y, x);
-						break;
-					case DEV_SLAVE_SPI:
-						printf("device y%02i x%02i SLAVE_SPI\n", y, x);
-						break;
-					case DEV_SUSPEND_SYNC:
-						printf("device y%02i x%02i SUSPEND_SYNC\n", y, x);
-						break;
-					case DEV_OCT_CALIBRATE:
-						printf("device y%02i x%02i OCT_CALIBRATE\n", y, x);
-						break;
-					case DEV_SPI_ACCESS:
-						printf("device y%02i x%02i SPI_ACCESS\n", y, x);
-						break;
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-int printf_ports(struct fpga_model* model)
-{
-	struct fpga_tile* tile;
-	const char* conn_point_name_src;
-	int x, y, i, conn_point_dests_o, num_dests_for_this_conn_point;
-	int first_port_printed;
-
-	for (x = 0; x < model->x_width; x++) {
-		for (y = 0; y < model->y_height; y++) {
-			tile = &model->tiles[y*model->x_width + x];
-
-			first_port_printed = 0;
-			for (i = 0; i < tile->num_conn_point_names; i++) {
-				conn_point_dests_o = tile->conn_point_names[i*2];
-				if (i < tile->num_conn_point_names-1)
-					num_dests_for_this_conn_point = tile->conn_point_names[(i+1)*2] - conn_point_dests_o;
-				else
-					num_dests_for_this_conn_point = tile->num_conn_point_dests - conn_point_dests_o;
-				if (num_dests_for_this_conn_point)
-					// ports is only for connection-less endpoints
-					continue;
-				conn_point_name_src = strarray_lookup(&model->str, tile->conn_point_names[i*2+1]);
-				if (!conn_point_name_src) {
-					fprintf(stderr, "Cannot lookup src conn point name index %i, x%i y%i i%i\n",
-						tile->conn_point_names[i*2+1], x, y, i);
-					continue;
-				}
-				if (!first_port_printed) {
-					first_port_printed = 1;
-					printf("\n");
-				}
-				printf("port y%02i x%02i %s\n", y, x, conn_point_name_src);
-			}
-		}
-	}
-	return 0;
-}
-
-int printf_conns(struct fpga_model* model)
-{
-	struct fpga_tile* tile;
-	char tmp_line[512];
-	const char* conn_point_name_src, *other_tile_connpt_str;
-	uint16_t other_tile_connpt_str_i;
-	int x, y, i, j, k, conn_point_dests_o, num_dests_for_this_conn_point;
-	int other_tile_x, other_tile_y, first_conn_printed;
-
-	for (x = 0; x < model->x_width; x++) {
-		for (y = 0; y < model->y_height; y++) {
-			tile = &model->tiles[y*model->x_width + x];
-
-			first_conn_printed = 0;
-			for (i = 0; i < tile->num_conn_point_names; i++) {
-				conn_point_dests_o = tile->conn_point_names[i*2];
-				if (i < tile->num_conn_point_names-1)
-					num_dests_for_this_conn_point = tile->conn_point_names[(i+1)*2] - conn_point_dests_o;
-				else
-					num_dests_for_this_conn_point = tile->num_conn_point_dests - conn_point_dests_o;
-				if (!num_dests_for_this_conn_point)
-					continue;
-				conn_point_name_src = strarray_lookup(&model->str, tile->conn_point_names[i*2+1]);
-				if (!conn_point_name_src) {
-					fprintf(stderr, "Cannot lookup src conn point name index %i, x%i y%i i%i\n",
-						tile->conn_point_names[i*2+1], x, y, i);
-					continue;
-				}
-				for (j = 0; j < num_dests_for_this_conn_point; j++) {
-					other_tile_x = tile->conn_point_dests[(conn_point_dests_o+j)*3];
-					other_tile_y = tile->conn_point_dests[(conn_point_dests_o+j)*3+1];
-					other_tile_connpt_str_i = tile->conn_point_dests[(conn_point_dests_o+j)*3+2];
-
-					other_tile_connpt_str = strarray_lookup(&model->str, other_tile_connpt_str_i);
-					if (!other_tile_connpt_str) {
-						fprintf(stderr, "Lookup err line %i, dest pt %i, dest x%i y%i, from x%i y%i j%i num_dests %i src_pt %s\n",
-							__LINE__, other_tile_connpt_str_i, other_tile_x, other_tile_y, x, y, j, num_dests_for_this_conn_point, conn_point_name_src);
-						continue;
-					}
-
-					if (!first_conn_printed) {
-						first_conn_printed = 1;
-						printf("\n");
-					}
-					sprintf(tmp_line, "static_conn y%02i x%02i %s ",
-						y, x, conn_point_name_src);
-					k = strlen(tmp_line);
-					while (k < 45)
-						tmp_line[k++] = ' ';
-					sprintf(&tmp_line[k], "y%02i x%02i %s\n",
-						other_tile_y, other_tile_x, other_tile_connpt_str);
-					printf(tmp_line);
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-int printf_switches(struct fpga_model* model)
-{
-	struct fpga_tile* tile;
-	int x, y, i, from_connpt_o, to_connpt_o, from_str_i, to_str_i;
-	int first_switch_printed, is_bidirectional;
-	const char* from_str, *to_str;
-
-	for (x = 0; x < model->x_width; x++) {
-		for (y = 0; y < model->y_height; y++) {
-			tile = YX_TILE(model, y, x);
-
-			first_switch_printed = 0;
-			for (i = 0; i < tile->num_switches; i++) {
-				from_connpt_o = (tile->switches[i] & 0x3FFF8000) >> 15;
-				to_connpt_o = tile->switches[i] & 0x00007FFF;
-				is_bidirectional = (tile->switches[i] & SWITCH_BIDIRECTIONAL) != 0;
-
-				from_str_i = tile->conn_point_names[from_connpt_o*2+1];
-				to_str_i = tile->conn_point_names[to_connpt_o*2+1];
-
-				from_str = strarray_lookup(&model->str, from_str_i);
-				to_str = strarray_lookup(&model->str, to_str_i);
-				if (!from_str || !to_str) {
-					fprintf(stderr, "Internal error in %s:%i, cannot lookup from_i %i or to_i %i\n",
-						__FILE__, __LINE__, from_str_i, to_str_i);
-					continue;
-				}
-				if (!first_switch_printed) {
-					first_switch_printed = 1;	
-					printf("\n");
-				}
-				printf("switch y%02i x%02i %s %s %s\n", y, x, from_str,
-					is_bidirectional ? "<->" : "->", to_str);
-			}
-		}
-	}
-	return 0;
-}