@@ -22,9 +22,6 @@ class CBCSolverFixture : public testing::TestWithParam<std::string> {};
2222
2323// Use FPL22 placement algorithm on a small subset of MiscBenchmarks
2424class FPL22Fixture : public testing ::TestWithParam<std::string> {};
25- class VerilogFixture : public testing ::TestWithParam<std::string> {};
26- class VerilogMemoryFixture : public testing ::TestWithParam<std::string> {};
27- class VerilogSharingFixture : public testing ::TestWithParam<std::string> {};
2825class MemoryFixture : public testing ::TestWithParam<std::string> {};
2926class SharingFixture : public testing ::TestWithParam<std::string> {};
3027class SharingUnitTestFixture : public testing ::TestWithParam<std::string> {};
@@ -185,7 +182,7 @@ TEST_P(SharingFixture, sharing_NoCI) {
185182 RecordProperty (" cycles" , std::to_string (configWithSharing.simTime ));
186183}
187184
188- TEST_P (SpecFixture, spec_NoCI ) {
185+ TEST_P (SpecFixture, spec ) {
189186 const std::string &name = GetParam ();
190187 int simTime = -1 ;
191188
@@ -194,70 +191,6 @@ TEST_P(SpecFixture, spec_NoCI) {
194191 RecordProperty (" cycles" , std::to_string (simTime));
195192}
196193
197- // Verilog
198- TEST_P (VerilogFixture, verilog_CI) {
199- IntegrationTestData config{
200- // clang-format off
201- .name = GetParam (),
202- .benchmarkPath = fs::path (DYNAMATIC_ROOT) / " integration-test" ,
203- .useVerilog = true ,
204- .useSharing = false ,
205- .milpSolver = " gurobi" ,
206- .bufferAlgorithm = " fpga20" ,
207- .simTime = -1
208- // clang-format on
209- };
210- EXPECT_EQ (runIntegrationTest (config), 0 );
211- RecordProperty (" cycles" , std::to_string (config.simTime ));
212- }
213- TEST_P (VerilogMemoryFixture, verilog_CI) {
214- IntegrationTestData config{
215- // clang-format off
216- .name = GetParam (),
217- .benchmarkPath = fs::path (DYNAMATIC_ROOT) / " integration-test" / " memory" ,
218- .useVerilog = true ,
219- .useSharing = false ,
220- .milpSolver = " gurobi" ,
221- .bufferAlgorithm = " fpga20" ,
222- .simTime = -1
223- // clang-format on
224- };
225- EXPECT_EQ (runIntegrationTest (config), 0 );
226- RecordProperty (" cycles" , std::to_string (config.simTime ));
227- }
228-
229- TEST_P (VerilogSharingFixture, verilog_CI) {
230- IntegrationTestData config{
231- // clang-format off
232- .name = GetParam (),
233- .benchmarkPath = fs::path (DYNAMATIC_ROOT) / " integration-test" / " sharing" ,
234- .useVerilog = true ,
235- .useSharing = false ,
236- .milpSolver = " gurobi" ,
237- .bufferAlgorithm = " fpga20" ,
238- .simTime = -1
239- // clang-format on
240- };
241- EXPECT_EQ (runIntegrationTest (config), 0 );
242- RecordProperty (" cycles" , std::to_string (config.simTime ));
243- }
244-
245- TEST_P (VerilogFixture, verilog_NoCI) {
246- IntegrationTestData config{
247- // clang-format off
248- .name = GetParam (),
249- .benchmarkPath = fs::path (DYNAMATIC_ROOT) / " integration-test" ,
250- .useVerilog = true ,
251- .useSharing = false ,
252- .milpSolver = " gurobi" ,
253- .bufferAlgorithm = " fpga20" ,
254- .simTime = -1
255- // clang-format on
256- };
257- EXPECT_EQ (runIntegrationTest (config), 0 );
258- RecordProperty (" cycles" , std::to_string (config.simTime ));
259- }
260-
261194// clang-format off
262195INSTANTIATE_TEST_SUITE_P (
263196 MiscBenchmarks, BasicFixture,
@@ -418,46 +351,4 @@ INSTANTIATE_TEST_SUITE_P(SpecBenchmarks, SpecFixture,
418351 " subdiag_fast"
419352 ),
420353 [](const auto &info) { return " spec_" + info.param ; });
421- // clang-format on
422-
423- // Verilog tests: CI safe
424- INSTANTIATE_TEST_SUITE_P (VerilogSharingTestsCI, VerilogSharingFixture,
425- testing::Values (" share_test_1" , " share_test_2" ),
426- [](const auto &info) {
427- return " sharing_" + info.param ;
428- });
429-
430- INSTANTIATE_TEST_SUITE_P (
431- VerilogMemoryTestsCI, VerilogMemoryFixture,
432- testing::Values (" test_flatten_array" , " test_memory_1" , " test_memory_10" ,
433- " test_memory_11" , " test_memory_12" , " test_memory_13" ,
434- " test_memory_14" , " test_memory_15" , " test_memory_16" ,
435- " test_memory_17" , " test_memory_18" , " test_memory_2" ,
436- " test_memory_3" , " test_memory_4" , " test_memory_5" ,
437- " test_memory_6" , " test_memory_7" , " test_memory_8" ,
438- " test_memory_9" , " test_smallbound" ),
439- [](const auto &info) { return " memory_" + info.param ; });
440-
441- INSTANTIATE_TEST_SUITE_P (
442- VerilogTestsCI, VerilogFixture,
443- testing::Values (" bicg" , " binary_search" , " factorial" , " fir" , " gaussian" ,
444- " gcd" , " gemver" , " if_loop_1" , " if_loop_2" , " if_loop_3" ,
445- " iir" , " image_resize" , " insertion_sort" ,
446- " iterative_division" , " iterative_sqrt" , " jacobi_1d_imper" ,
447- " kernel_2mm" , " kernel_3mm" , " kmp" , " loop_array" , " matrix" ,
448- " matrix_power" , " matvec" , " mul_example" , " pivot" ,
449- " polyn_mult" , " simple_example_1" , " sobel" , " spmv" ,
450- " stencil_2d" , " sumi3_mem" , " test_loop_free" , " test_stdint" ,
451- " threshold" , " triangular" , " vector_rescale" , " video_filter" ,
452- " while_loop_1" , " while_loop_3" ),
453- [](const auto &info) { return info.param ; });
454-
455- // Verilog tests: NoCI
456- INSTANTIATE_TEST_SUITE_P (
457- VerilogTests_NoCI, VerilogFixture,
458- testing::Values (" atax" , " atax_float" , " bicg_float" , " float_basic" , " gemm" ,
459- " gemm_float" , " gemver_float" , " gesummv_float" , " get_tanh" ,
460- " gsum" , " gsumif" , " histogram" , " if_loop_add" , " if_loop_mul" ,
461- " kernel_2mm_float" , " kernel_3mm_float" , " lu" , " matching" ,
462- " matching_2" , " mvt_float" , " symm_float" , " syr2k_float" ),
463- [](const auto &info) { return info.param ; });
354+ // clang-format on
0 commit comments