More comprehensive testing of is_int8_hw_support

Author: Mousius

python/tvm/topi/arm_cpu/conv2d_int8.py

@@ -125,7 +125,9 @@ def is_int8_hw_support(data_dtype, kernel_dtype):
 
     # 3) Check target
     current_target = target.Target.current(allow_none=False)
-    is_target_support = bool(current_target.features.has_asimd or current_target.features.has_dotprod)
+    is_target_support = bool(
+        current_target.features.has_asimd or current_target.features.has_dotprod
+    )
 
     return is_dtype_support and is_llvm_support and is_target_support
 

tests/python/target/test_arm_target.py

@@ -20,23 +20,32 @@
 from tvm.topi.arm_cpu.conv2d_int8 import is_int8_hw_support
 from tvm.target import codegen
 
-arm_target, input_dtype, kernel_dtype, is_supported = tvm.testing.parameters(
+llvm_version, arm_target, input_dtype, kernel_dtype, is_supported = tvm.testing.parameters(
     # Testing mcpu type
-    ("c -mcpu=cortex-m4 -keys=arm_cpu", "int8", "int8", False),
-    ("c -mcpu=cortex-m7 -keys=arm_cpu", "int8", "int8", False),
-    ("c -mcpu=cortex-m33 -keys=arm_cpu", "int8", "int8", False),
-    ("c -mcpu=cortex-m55 -keys=arm_cpu", "int8", "int8", False),
-    ("c -mcpu=cortex-m3 -keys=arm_cpu", "int8", "int8", False),
-    ("llvm -mtriple=aarch64-linux-gnu -mattr=+neon", "int8", "int8", True),
-    ("llvm -mtriple=aarch64-linux-gnu -mattr=+v8.4a,+dotprod", "int8", "int8", True),
+    (8, "c -mcpu=cortex-m4", "int8", "int8", False),
+    (8, "c -mcpu=cortex-m7", "int8", "int8", False),
+    (8, "c -mcpu=cortex-m33", "int8", "int8", False),
+    (8, "c -mcpu=cortex-m55", "int8", "int8", False),
+    (8, "c -mcpu=cortex-m3", "int8", "int8", False),
+
+    (7, "llvm -mtriple=arm-linux-gnueabi -mattr=+neon", "int8", "int8", False),
+    (8, "llvm -mtriple=arm-linux-gnueabi -mattr=+neon", "int8", "int8", True),
+    (9, "llvm -mtriple=arm-linux-gnueabi -mattr=+neon", "int8", "int8", True),
+    (8, "llvm -mtriple=arm-linux-gnueabi", "int8", "int8", False),
+
+    (7, "llvm -mtriple=aarch64-linux-gnu -mattr=+v8.4a,+dotprod", "int8", "int8", False),
+    (8, "llvm -mtriple=aarch64-linux-gnu -mattr=+v8.4a,+dotprod", "int8", "int8", True),
+    (9, "llvm -mtriple=arm-linux-gnueabi -mattr=+neon", "int8", "int8", True),
+    (8, "llvm -mtriple=aarch64-linux-gnu", "int8", "int8", True),
+
     # Testing dtype
-    ("llvm -mtriple=aarch64-linux-gnu -mattr=+neon", "int16", "int8", False),
-    ("llvm -mtriple=aarch64-linux-gnu -mattr=+neon", "int8", "int16", False),
-    ("llvm -mtriple=aarch64-linux-gnu -mattr=+neon", "int16", "int16", False),
+    (8, "llvm -mtriple=aarch64-linux-gnu -mattr=+neon", "int16", "int8", False),
+    (8, "llvm -mtriple=aarch64-linux-gnu -mattr=+neon", "int8", "int16", False),
+    (8, "llvm -mtriple=aarch64-linux-gnu -mattr=+neon", "int16", "int16", False),
 )
 
 
-def test_arm_conv2d_int8_support(arm_target, input_dtype, kernel_dtype, is_supported):
+def test_arm_conv2d_int8_support(monkeypatch, llvm_version, arm_target, input_dtype, kernel_dtype, is_supported):
     """Test ARM conv2d int8 support for different targets.
 
     Parameters
@@ -51,5 +60,5 @@ def test_arm_conv2d_int8_support(arm_target, input_dtype, kernel_dtype, is_suppo
         Expected result.
     """
     with tvm.target.Target(arm_target):
-        expected_result = is_supported and (codegen.llvm_version_major() >= 8)
-        assert is_int8_hw_support(input_dtype, kernel_dtype) == expected_result
+        monkeypatch.setattr(codegen, 'llvm_version_major', lambda: llvm_version)
+        assert is_int8_hw_support(input_dtype, kernel_dtype) == is_supported