From 008a8e4a06c57ed1a6bb227db9f927afb3d0a645 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Tue, 11 Aug 2020 22:50:57 +0200
Subject: [PATCH] [Test] use node.name to index into expected cycles dict
---
tests/fpgadataflow/test_convert_to_hls_conv_layer.py | 2 +-
tests/fpgadataflow/test_convert_to_hls_pool_batch.py | 2 +-
tests/fpgadataflow/test_fpgadataflow_addstreams.py | 2 +-
tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py | 2 +-
tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py | 2 +-
tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py | 2 +-
tests/fpgadataflow/test_fpgadataflow_fclayer.py | 6 ++----
tests/fpgadataflow/test_fpgadataflow_fmpadding.py | 2 +-
tests/fpgadataflow/test_fpgadataflow_globalaccpool.py | 2 +-
tests/fpgadataflow/test_fpgadataflow_thresholding.py | 2 +-
tests/fpgadataflow/test_layer_streaming_maxpool_batch.py | 2 +-
11 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/tests/fpgadataflow/test_convert_to_hls_conv_layer.py b/tests/fpgadataflow/test_convert_to_hls_conv_layer.py
index 081d5a3b9..6d1ff31ab 100644
--- a/tests/fpgadataflow/test_convert_to_hls_conv_layer.py
+++ b/tests/fpgadataflow/test_convert_to_hls_conv_layer.py
@@ -117,7 +117,7 @@ def test_convert_to_hls_conv_layer(conv_config, exec_mode):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = new_model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=11)
assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_convert_to_hls_pool_batch.py b/tests/fpgadataflow/test_convert_to_hls_pool_batch.py
index 2915ba48c..fbf1e72da 100644
--- a/tests/fpgadataflow/test_convert_to_hls_pool_batch.py
+++ b/tests/fpgadataflow/test_convert_to_hls_pool_batch.py
@@ -217,5 +217,5 @@ def test_convert_to_hls_pool_batch(
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = new_model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=10)
diff --git a/tests/fpgadataflow/test_fpgadataflow_addstreams.py b/tests/fpgadataflow/test_fpgadataflow_addstreams.py
index 70cf1f109..7a3df667b 100644
--- a/tests/fpgadataflow/test_fpgadataflow_addstreams.py
+++ b/tests/fpgadataflow/test_fpgadataflow_addstreams.py
@@ -134,6 +134,6 @@ def test_fpgadataflow_addstreams(idt, ch, fold, exec_mode):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=10)
assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py b/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py
index 1a5aa82e0..3cd937287 100644
--- a/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py
+++ b/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py
@@ -161,6 +161,6 @@ def test_fpgadataflow_channelwise_ops(idt, act, pdt, nf, ich, func, vecs, exec_m
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=10)
assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py b/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py
index 9bf7117db..afebcca73 100644
--- a/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py
+++ b/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py
@@ -192,6 +192,6 @@ def test_fpgadataflow_slidingwindow(
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=10)
assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py b/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py
index 241586a0d..4255a4dca 100644
--- a/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py
+++ b/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py
@@ -139,6 +139,6 @@ def test_fpgadataflow_duplicatestreams(idt, ch, fold, imdim, exec_mode):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=10)
assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_fclayer.py b/tests/fpgadataflow/test_fpgadataflow_fclayer.py
index 60473e8b7..249f84e90 100644
--- a/tests/fpgadataflow/test_fpgadataflow_fclayer.py
+++ b/tests/fpgadataflow/test_fpgadataflow_fclayer.py
@@ -316,12 +316,11 @@ def test_fpgadataflow_fclayer_rtlsim(mem_mode, idt, wdt, act, nf, sf, mw, mh):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=15)
assert exp_cycles != 0
-
# mem_mode: const or decoupled
@pytest.mark.parametrize("mem_mode", ["decoupled"])
# activation: None or DataType
@@ -418,7 +417,6 @@ def test_fpgadataflow_fclayer_large_depth_decoupled_mode_rtlsim(
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=15)
assert exp_cycles != 0
-
diff --git a/tests/fpgadataflow/test_fpgadataflow_fmpadding.py b/tests/fpgadataflow/test_fpgadataflow_fmpadding.py
index d5e25050a..d1142ceac 100644
--- a/tests/fpgadataflow/test_fpgadataflow_fmpadding.py
+++ b/tests/fpgadataflow/test_fpgadataflow_fmpadding.py
@@ -131,6 +131,6 @@ def test_fpgadataflow_fmpadding(idim, pad, num_ch, simd, pad_style, idt, mode):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=10)
assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py b/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py
index 974f17c9f..06a1311ab 100644
--- a/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py
+++ b/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py
@@ -129,7 +129,7 @@ def test_fpgadataflow_globalaccpool(idt, ch, fold, imdim, exec_mode):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
# commented out, needs performance debug:
# test_fpgadataflow_globalaccpool[rtlsim-7-1-64-DataType.UINT4]
# assert False where False =
diff --git a/tests/fpgadataflow/test_fpgadataflow_thresholding.py b/tests/fpgadataflow/test_fpgadataflow_thresholding.py
index 9d4f83a64..218c9e61e 100644
--- a/tests/fpgadataflow/test_fpgadataflow_thresholding.py
+++ b/tests/fpgadataflow/test_fpgadataflow_thresholding.py
@@ -159,6 +159,6 @@ def test_fpgadataflow_thresholding(idt, act, nf, ich, exec_mode):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=10)
assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py b/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py
index 0a2275c17..0b021a4c4 100644
--- a/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py
+++ b/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py
@@ -163,6 +163,6 @@ def test_fpgadataflow_streamingmaxpool(idt, k, ifm_dim, ifm_ch, exec_mode):
inst = getCustomOp(node)
sim_cycles = inst.get_nodeattr("sim_cycles")
exp_cycles_dict = model.analysis(exp_cycles_per_layer)
- exp_cycles = exp_cycles_dict[str(node)]
+ exp_cycles = exp_cycles_dict[node.name]
assert np.isclose(exp_cycles, sim_cycles, atol=15)
assert exp_cycles != 0
--
GitLab