Skip to content

Commit 0bace2e

Browse files
fix compilation error in test_read_xml_arch_file.cpp
1 parent 3318060 commit 0bace2e

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

libs/libarchfpga/test/test_read_xml_arch_file.cpp

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,21 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
148148
t_noc_inf test_noc;
149149

150150
// mesh parameters
151-
double mesh_start_x = 10;
152-
double mesh_start_y = 10;
153-
double mesh_end_x = 5;
154-
double mesh_end_y = 56;
155-
double mesh_size = 0;
151+
float mesh_start_x = 10;
152+
float mesh_start_y = 10;
153+
float mesh_end_x = 5;
154+
float mesh_end_y = 56;
155+
float mesh_size = 0;
156+
int mesh_start_layer = 0;
157+
int mesh_end_layer = 0;
156158

157159
SECTION("Check the error where a mesh size was illegal.") {
158-
REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_size), "The NoC mesh size cannot be 0.");
160+
REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size), "The NoC mesh size cannot be 0.");
159161
}
160162
SECTION("Check the error where a mesh region size was invalid.") {
161163
mesh_size = 3;
162164

163-
REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_size), "The NoC region is invalid.");
165+
REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size), "The NoC region is invalid.");
164166
}
165167
SECTION("Check the mesh creation for integer precision coordinates.") {
166168
// define test parameters
@@ -173,8 +175,8 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
173175
mesh_end_y = 4;
174176

175177
// create the golden results
176-
double golden_results_x[9];
177-
double golden_results_y[9];
178+
float golden_results_x[9];
179+
float golden_results_y[9];
178180

179181
// first row of the mesh
180182
golden_results_x[0] = 0;
@@ -200,7 +202,7 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
200202
golden_results_x[8] = 4;
201203
golden_results_y[8] = 4;
202204

203-
generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_size);
205+
generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size);
204206

205207
// go through all the expected routers
206208
for (int expected_router_id = 0; expected_router_id < (mesh_size * mesh_size); expected_router_id++) {
@@ -224,9 +226,9 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
224226
mesh_end_x = 10.8;
225227
mesh_end_y = 6.4;
226228

227-
// create the golden golden results
228-
double golden_results_x[9];
229-
double golden_results_y[9];
229+
// create the golden results
230+
float golden_results_x[9];
231+
float golden_results_y[9];
230232

231233
// first row of the mesh
232234
golden_results_x[0] = 3.5;
@@ -252,7 +254,7 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
252254
golden_results_x[8] = 10.8;
253255
golden_results_y[8] = 6.4;
254256

255-
generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_size);
257+
generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size);
256258

257259
// go through all the expected routers
258260
for (int expected_router_id = 0; expected_router_id < (mesh_size * mesh_size); expected_router_id++) {

0 commit comments

Comments
 (0)