From 52d8e6da749eed9cc1383d4f525be1f28e5a1448 Mon Sep 17 00:00:00 2001 From: Yaman Umuroglu <maltanar@gmail.com> Date: Thu, 14 May 2020 14:47:38 +0100 Subject: [PATCH] [Test] add slow marker to most slow-running tests --- tests/end2end/test_end2end_cnv_w1a1.py | 2 ++ tests/end2end/test_end2end_tfc_w1a1_throughput_test.py | 2 ++ tests/end2end/test_end2end_tfc_w1a2.py | 2 ++ tests/end2end/test_end2end_tfc_w2a2.py | 2 ++ tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py | 1 + tests/fpgadataflow/test_fpgadataflow_dwc.py | 1 + tests/fpgadataflow/test_fpgadataflow_fclayer.py | 2 ++ tests/fpgadataflow/test_fpgadataflow_fifo.py | 1 + tests/fpgadataflow/test_fpgadataflow_ip_stitch.py | 1 + tests/fpgadataflow/test_layer_streaming_maxpool_batch.py | 1 + 10 files changed, 15 insertions(+) diff --git a/tests/end2end/test_end2end_cnv_w1a1.py b/tests/end2end/test_end2end_cnv_w1a1.py index 7dd45cbc7..47d69b3e9 100644 --- a/tests/end2end/test_end2end_cnv_w1a1.py +++ b/tests/end2end/test_end2end_cnv_w1a1.py @@ -167,6 +167,7 @@ def test_end2end_cnv_w1a1_fold_and_tlastmarker(): model.save(build_dir + "/end2end_cnv_w1a1_folded.onnx") +@pytest.mark.slow def test_end2end_cnv_w1a1_gen_hls_ip(): model = ModelWrapper(build_dir + "/end2end_cnv_w1a1_folded.onnx") model = model.transform(PrepareIP(test_fpga_part, target_clk_ns)) @@ -263,6 +264,7 @@ def test_end2end_cnv_w1a1_make_pynq_proj(): model.save(build_dir + "/end2end_cnv_w1a1_pynq_project.onnx") +@pytest.mark.slow def test_end2end_cnv_w1a1_synth_pynq_project(): model = ModelWrapper(build_dir + "/end2end_cnv_w1a1_pynq_project.onnx") model = model.transform(SynthPYNQProject()) diff --git a/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py b/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py index 74cd46549..df53524ff 100644 --- a/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py +++ b/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py @@ -153,6 +153,7 @@ def test_end2end_tfc_w1a1_fold_and_tlastmarker(): model.save(build_dir + "/end2end_tfc_w1a1_folded.onnx") +@pytest.mark.slow def test_end2end_tfc_w1a1_gen_hls_ip(): model = ModelWrapper(build_dir + "/end2end_tfc_w1a1_folded.onnx") model = model.transform(PrepareIP(test_fpga_part, target_clk_ns)) @@ -241,6 +242,7 @@ def test_end2end_tfc_w1a1_make_pynq_proj(): model.save(build_dir + "/end2end_tfc_w1a1_pynq_project.onnx") +@pytest.mark.slow def test_end2end_tfc_w1a1_synth_pynq_project(): model = ModelWrapper(build_dir + "/end2end_tfc_w1a1_pynq_project.onnx") model = model.transform(SynthPYNQProject()) diff --git a/tests/end2end/test_end2end_tfc_w1a2.py b/tests/end2end/test_end2end_tfc_w1a2.py index 5ee294284..716a72a69 100644 --- a/tests/end2end/test_end2end_tfc_w1a2.py +++ b/tests/end2end/test_end2end_tfc_w1a2.py @@ -145,6 +145,7 @@ def test_end2end_tfc_w1a2_fold_and_tlastmarker(): model.save(build_dir + "/end2end_tfc_w1a2_folded.onnx") +@pytest.mark.slow def test_end2end_tfc_w1a2_gen_hls_ip(): model = ModelWrapper(build_dir + "/end2end_tfc_w1a2_folded.onnx") model = model.transform(PrepareIP(test_fpga_part, target_clk_ns)) @@ -233,6 +234,7 @@ def test_end2end_tfc_w1a2_make_pynq_proj(): model.save(build_dir + "/end2end_tfc_w1a2_pynq_project.onnx") +@pytest.mark.slow def test_end2end_tfc_w1a2_synth_pynq_project(): model = ModelWrapper(build_dir + "/end2end_tfc_w1a2_pynq_project.onnx") model = model.transform(SynthPYNQProject()) diff --git a/tests/end2end/test_end2end_tfc_w2a2.py b/tests/end2end/test_end2end_tfc_w2a2.py index 2477318ef..f11d065a9 100644 --- a/tests/end2end/test_end2end_tfc_w2a2.py +++ b/tests/end2end/test_end2end_tfc_w2a2.py @@ -145,6 +145,7 @@ def test_end2end_tfc_w2a2_fold_and_tlastmarker(): model.save(build_dir + "/end2end_tfc_w2a2_folded.onnx") +@pytest.mark.slow def test_end2end_tfc_w2a2_gen_hls_ip(): model = ModelWrapper(build_dir + "/end2end_tfc_w2a2_folded.onnx") model = model.transform(PrepareIP(test_fpga_part, target_clk_ns)) @@ -233,6 +234,7 @@ def test_end2end_tfc_w2a2_make_pynq_proj(): model.save(build_dir + "/end2end_tfc_w2a2_pynq_project.onnx") +@pytest.mark.slow def test_end2end_tfc_w2a2_synth_pynq_project(): model = ModelWrapper(build_dir + "/end2end_tfc_w2a2_pynq_project.onnx") model = model.transform(SynthPYNQProject()) diff --git a/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py b/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py index 02a9acae5..826a9a09b 100644 --- a/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py +++ b/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py @@ -137,6 +137,7 @@ def prepare_inputs(input_tensor): @pytest.mark.parametrize("exec_mode", ["cppsim", "rtlsim"]) # input channel parallelism ("SIMD") @pytest.mark.parametrize("simd", [1, 2]) +@pytest.mark.slow def test_fpgadataflow_slidingwindow(idt, k, ifm_dim, ifm_ch, stride, exec_mode, simd): ofm_dim = int(((ifm_dim - k) / stride) + 1) diff --git a/tests/fpgadataflow/test_fpgadataflow_dwc.py b/tests/fpgadataflow/test_fpgadataflow_dwc.py index a230fb420..4380ab50d 100644 --- a/tests/fpgadataflow/test_fpgadataflow_dwc.py +++ b/tests/fpgadataflow/test_fpgadataflow_dwc.py @@ -55,6 +55,7 @@ def prepare_inputs(input_tensor, dt): @pytest.mark.parametrize("OUTWidth", [2, 4]) # finn_dtype @pytest.mark.parametrize("finn_dtype", [DataType.BIPOLAR, DataType.INT2]) +@pytest.mark.slow def test_fpgadataflow_dwc_rtlsim(Shape, INWidth, OUTWidth, finn_dtype): # generate input data diff --git a/tests/fpgadataflow/test_fpgadataflow_fclayer.py b/tests/fpgadataflow/test_fpgadataflow_fclayer.py index 416d96d5d..e709598e9 100644 --- a/tests/fpgadataflow/test_fpgadataflow_fclayer.py +++ b/tests/fpgadataflow/test_fpgadataflow_fclayer.py @@ -149,6 +149,7 @@ def prepare_inputs(input_tensor, idt, wdt): @pytest.mark.parametrize("mw", [16]) # HLS matrix height (output features) @pytest.mark.parametrize("mh", [16]) +@pytest.mark.slow def test_fpgadataflow_fclayer_cppsim(mem_mode, idt, wdt, act, nf, sf, mw, mh): if nf == -1: nf = mh @@ -234,6 +235,7 @@ def test_fpgadataflow_fclayer_cppsim(mem_mode, idt, wdt, act, nf, sf, mw, mh): @pytest.mark.parametrize("mw", [16]) # HLS matrix height (output features) @pytest.mark.parametrize("mh", [16]) +@pytest.mark.slow def test_fpgadataflow_fclayer_rtlsim(mem_mode, idt, wdt, act, nf, sf, mw, mh): if nf == -1: nf = mh diff --git a/tests/fpgadataflow/test_fpgadataflow_fifo.py b/tests/fpgadataflow/test_fpgadataflow_fifo.py index 9158a0b0e..9c68f523a 100644 --- a/tests/fpgadataflow/test_fpgadataflow_fifo.py +++ b/tests/fpgadataflow/test_fpgadataflow_fifo.py @@ -76,6 +76,7 @@ def prepare_inputs(input_tensor, dt): @pytest.mark.parametrize("depth", [16]) # finn_dtype @pytest.mark.parametrize("finn_dtype", [DataType.BIPOLAR]) # , DataType.INT2]) +@pytest.mark.slow def test_fpgadataflow_fifo_rtlsim(Shape, folded_shape, depth, finn_dtype): # generate input data diff --git a/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py b/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py index 30b86d639..1aaf71ffa 100644 --- a/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py +++ b/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py @@ -284,6 +284,7 @@ def test_fpgadataflow_ipstitch_pynq_projgen(): model.save(ip_stitch_model_dir + "/test_fpgadataflow_pynq_projgen.onnx") +@pytest.mark.slow def test_fpgadataflow_ipstitch_pynq_synth(): model = ModelWrapper(ip_stitch_model_dir + "/test_fpgadataflow_pynq_projgen.onnx") model = model.transform(SynthPYNQProject()) diff --git a/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py b/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py index ac4ab3346..958694d1c 100644 --- a/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py +++ b/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py @@ -121,6 +121,7 @@ def prepare_inputs(input_tensor): @pytest.mark.parametrize("ifm_ch", [1, 2]) # , 2, 3, 4]) # execution mode @pytest.mark.parametrize("exec_mode", ["rtlsim", "cppsim"]) +@pytest.mark.slow def test_fpgadataflow_streamingmaxpool(idt, k, ifm_dim, ifm_ch, exec_mode): stride = k ofm_dim = int(((ifm_dim - k) / stride) + 1) -- GitLab