Add test for instrumentation inquiry

Author: mandolaerik

test/1.2/registers/T_instrumentation.py

@@ -1,6 +1,7 @@
 # © 2021-2023 Intel Corporation
 # SPDX-License-Identifier: MPL-2.0
 
+import instrumentation_access_initiator
 import instrumentation_access_inquire
 import instrumentation_access_set_missed
 import instrumentation_access_set_offset
@@ -23,10 +24,8 @@
 import instrumentation_remove_connection_callbacks
 import instrumentation_subscribe_multiple
 
-subscribe_b1 = SIM_get_port_interface(
-    obj, 'bank_instrumentation_subscribe', 'b1')
-subscribe_b2 = SIM_get_port_interface(
-    obj, 'bank_instrumentation_subscribe', 'b2')
+subscribe_b1 = obj.bank.b1.iface.bank_instrumentation_subscribe
+subscribe_b2 = obj.bank.b2.iface.bank_instrumentation_subscribe
 order_b1 = SIM_get_port_interface(obj, 'instrumentation_order', 'b1')
 
 subscribe_ba = [
@@ -37,6 +36,7 @@
 # order test first
 instrumentation_connection_order.test(obj, subscribe_b1, order_b1)
 
+instrumentation_access_initiator.test(obj, subscribe_b2)
 instrumentation_access_inquire.test(obj, subscribe_b2)
 instrumentation_access_set_missed.test(obj, subscribe_b1)
 instrumentation_access_set_offset.test(obj, subscribe_b1)

test/1.4/registers/instrumentation_test.py

@@ -1,6 +1,7 @@
 # © 2021-2023 Intel Corporation
 # SPDX-License-Identifier: MPL-2.0
 
+import instrumentation_access_initiator
 import instrumentation_access_inquire
 import instrumentation_access_set_missed
 import instrumentation_access_set_offset
@@ -38,8 +39,7 @@ def test(obj):
     # order test first
     instrumentation_connection_order.test(obj, subscribe_b1, order_b1)
 
-    # Disabled tests below broke at some point around 84eff65716f while
-    # the instrumentation tests were disabled
+    instrumentation_access_initiator.test(obj, subscribe_b2)
     instrumentation_access_inquire.test(obj, subscribe_b2)
     with stest.allow_log_mgr(None, 'spec-viol'):
         instrumentation_access_set_missed.test(obj, subscribe_b1)

test/common/instrumentation_access_initiator.py

@@ -0,0 +1,44 @@
+# © 2023 Intel Corporation
+# SPDX-License-Identifier: MPL-2.0
+
+import conf
+import dev_util
+import stest
+
+def test(obj, provider):
+    calls = []
+    handles = [
+        provider.register_before_read(
+            None, 0, 4,
+            lambda _, access, handle, _2: calls.append(
+                ('br', access.initiator(handle))),
+            None),
+        provider.register_after_read(
+            None, 0, 4,
+            lambda _, access, handle, _2: calls.append(
+            ('ar', access.initiator(handle))),
+            None),
+        provider.register_before_write(
+            None, 0, 4,
+            lambda _, access, handle, _2: calls.append(
+                ('bw', access.initiator(handle))),
+            None),
+        provider.register_after_write(
+            None, 0, 4,
+            lambda _, access, handle, _2: calls.append(
+                ('aw', access.initiator(handle))),
+            None)]
+
+    for (reg, ini) in [
+            (dev_util.Register_LE(obj.bank.b2, 0, 4), None),
+            (dev_util.Register_LE(obj.bank.b2, 0, 4, initiator=conf.sim),
+             conf.sim)]:
+        stest.expect_equal(reg.read(), 4)
+        stest.expect_equal(calls, [('br', ini), ('ar', ini)])
+        del calls[:]
+        reg.write(4)
+        stest.expect_equal(calls, [('bw', ini), ('aw', ini)])
+        del calls[:]
+
+    for handle in handles:
+        provider.remove_callback(handle)