Integrate llvm-project and bump dependencies (#13444)

Integrate llvm-project and bump dependencies * llvm-project: 8ed9cf06e900 * cherry-pick: bf67a287, 4bf846ba40f1, 2df215f7a6a1, fa43608d1649, ab2e224e * mlir-hlo: 3dd6f1047aa8ea23506a4fab8cd8d9ce3b777884 * disable failing riscv tests * update API exports
iree-org · May 8, 2023 · cbdd789 · cbdd789
1 parent 32d7e10
commit cbdd789
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 7 deletions.
diff --git a/build_tools/cmake/test_riscv.sh b/build_tools/cmake/test_riscv.sh
@@ -93,6 +93,13 @@ test_exclude_args+=(
   "iree/tests/e2e/matmul/e2e_matmul_mmt4d_i8_small_llvm-cpu_local-task"
   "iree/tests/e2e/tensor_ops/check_llvm-cpu_local-task_pack.mlir"
   "iree/tests/e2e/tensor_ops/check_llvm-cpu_local-task_pack_dynamic_inner_tiles.mlir"
+  # TODO(#13421): Enable the tests
+  "iree/tests/e2e/stablehlo_ops/check_llvm-cpu_local-task_dot.mlir"
+  "iree/tests/e2e/xla_ops/check_llvm-cpu_local-task_dot.mlir"
+  "iree/tests/e2e/matmul/e2e_matmul_direct_i8_small_llvm-cpu_local-task"
+  "iree/tests/e2e/matmul/e2e_matmul_direct_f32_small_llvm-cpu_local-task"
+  "iree/tests/e2e/matmul/e2e_matmul_direct_f32_small_no_padding_llvm-cpu_local-task"
+  "iree/tests/e2e/regression/check_regression_llvm-cpu_strided_slice.mlir"
 )
 
 tests_label_exclude_regex="($(IFS="|" ; echo "${label_exclude_args[*]}"))"

diff --git a/build_tools/python/e2e_model_tests/test_definitions.py b/build_tools/python/e2e_model_tests/test_definitions.py
@@ -76,7 +76,10 @@ class ModelTestConfig(object):
             tflite_models.EFFICIENTNET_INT8),
         execution_config=module_execution_configs.ELF_LOCAL_SYNC_CONFIG,
         expected_output="efficientnet_int8_expected_output.txt",
-        unsupported_platforms=[CMakePlatform.ANDROID_ARMV8_A]),
+        unsupported_platforms=[
+            CMakePlatform.ANDROID_ARMV8_A, CMakePlatform.LINUX_RISCV32,
+            CMakePlatform.LINUX_RISCV64
+        ]),
     # deeplab_v3_fp32_correctness_test
     ModelTestConfig(
         name="deeplab_v3_fp32_correctness_test",
@@ -85,7 +88,9 @@ class ModelTestConfig(object):
         execution_config=module_execution_configs.ELF_LOCAL_SYNC_CONFIG,
         expected_output="deeplab_v3_fp32_input_0_expected_output.npy",
         extra_test_flags=["--expected_f32_threshold=0.001"],
-        unsupported_platforms=[CMakePlatform.LINUX_RISCV32]),
+        unsupported_platforms=[
+            CMakePlatform.LINUX_RISCV32, CMakePlatform.LINUX_RISCV64
+        ]),
     # person_detect_int8_correctness_test
     ModelTestConfig(
         name="person_detect_int8_correctness_test",

diff --git a/compiler/src/iree/compiler/API/api_exports.c b/compiler/src/iree/compiler/API/api_exports.c
@@ -175,6 +175,9 @@ extern void mlirBlockInsertOwnedOperationBefore();
 extern void mlirBlockPrint();
 extern void mlirBoolAttrGet();
 extern void mlirBoolAttrGetValue();
+extern void mlirBytecodeWriterConfigCreate();
+extern void mlirBytecodeWriterConfigDesiredEmitVersion();
+extern void mlirBytecodeWriterConfigDestroy();
 extern void mlirComplexTypeGet();
 extern void mlirComplexTypeGetElementType();
 extern void mlirContextAppendDialectRegistry();
@@ -446,6 +449,7 @@ extern void mlirOperationStateEnableResultTypeInference();
 extern void mlirOperationStateGet();
 extern void mlirOperationVerify();
 extern void mlirOperationWriteBytecode();
+extern void mlirOperationWriteBytecodeWithConfig();
 extern void mlirPDLAttributeTypeGet();
 extern void mlirPDLOperationTypeGet();
 extern void mlirPDLRangeTypeGet();
@@ -760,6 +764,9 @@ uintptr_t __iree_compiler_hidden_force_extern() {
   x += (uintptr_t)&mlirBlockPrint;
   x += (uintptr_t)&mlirBoolAttrGet;
   x += (uintptr_t)&mlirBoolAttrGetValue;
+  x += (uintptr_t)&mlirBytecodeWriterConfigCreate;
+  x += (uintptr_t)&mlirBytecodeWriterConfigDesiredEmitVersion;
+  x += (uintptr_t)&mlirBytecodeWriterConfigDestroy;
   x += (uintptr_t)&mlirComplexTypeGet;
   x += (uintptr_t)&mlirComplexTypeGetElementType;
   x += (uintptr_t)&mlirContextAppendDialectRegistry;
@@ -1031,6 +1038,7 @@ uintptr_t __iree_compiler_hidden_force_extern() {
   x += (uintptr_t)&mlirOperationStateGet;
   x += (uintptr_t)&mlirOperationVerify;
   x += (uintptr_t)&mlirOperationWriteBytecode;
+  x += (uintptr_t)&mlirOperationWriteBytecodeWithConfig;
   x += (uintptr_t)&mlirPDLAttributeTypeGet;
   x += (uintptr_t)&mlirPDLOperationTypeGet;
   x += (uintptr_t)&mlirPDLRangeTypeGet;

diff --git a/compiler/src/iree/compiler/API/api_exports.def b/compiler/src/iree/compiler/API/api_exports.def
@@ -167,6 +167,9 @@ EXPORTS
   mlirBlockPrint
   mlirBoolAttrGet
   mlirBoolAttrGetValue
+  mlirBytecodeWriterConfigCreate
+  mlirBytecodeWriterConfigDesiredEmitVersion
+  mlirBytecodeWriterConfigDestroy
   mlirComplexTypeGet
   mlirComplexTypeGetElementType
   mlirContextAppendDialectRegistry
@@ -438,6 +441,7 @@ EXPORTS
   mlirOperationStateGet
   mlirOperationVerify
   mlirOperationWriteBytecode
+  mlirOperationWriteBytecodeWithConfig
   mlirPDLAttributeTypeGet
   mlirPDLOperationTypeGet
   mlirPDLRangeTypeGet

diff --git a/compiler/src/iree/compiler/API/api_exports.ld b/compiler/src/iree/compiler/API/api_exports.ld
@@ -168,6 +168,9 @@ VER_0 {
     mlirBlockPrint;
     mlirBoolAttrGet;
     mlirBoolAttrGetValue;
+    mlirBytecodeWriterConfigCreate;
+    mlirBytecodeWriterConfigDesiredEmitVersion;
+    mlirBytecodeWriterConfigDestroy;
     mlirComplexTypeGet;
     mlirComplexTypeGetElementType;
     mlirContextAppendDialectRegistry;
@@ -439,6 +442,7 @@ VER_0 {
     mlirOperationStateGet;
     mlirOperationVerify;
     mlirOperationWriteBytecode;
+    mlirOperationWriteBytecodeWithConfig;
     mlirPDLAttributeTypeGet;
     mlirPDLOperationTypeGet;
     mlirPDLRangeTypeGet;

diff --git a/compiler/src/iree/compiler/API/api_exports.macos.lst b/compiler/src/iree/compiler/API/api_exports.macos.lst
@@ -166,6 +166,9 @@ _mlirBlockInsertOwnedOperationBefore
 _mlirBlockPrint
 _mlirBoolAttrGet
 _mlirBoolAttrGetValue
+_mlirBytecodeWriterConfigCreate
+_mlirBytecodeWriterConfigDesiredEmitVersion
+_mlirBytecodeWriterConfigDestroy
 _mlirComplexTypeGet
 _mlirComplexTypeGetElementType
 _mlirContextAppendDialectRegistry
@@ -437,6 +440,7 @@ _mlirOperationStateEnableResultTypeInference
 _mlirOperationStateGet
 _mlirOperationVerify
 _mlirOperationWriteBytecode
+_mlirOperationWriteBytecodeWithConfig
 _mlirPDLAttributeTypeGet
 _mlirPDLOperationTypeGet
 _mlirPDLRangeTypeGet

diff --git a/tests/e2e/models/generated_e2e_model_tests.cmake b/tests/e2e/models/generated_e2e_model_tests.cmake
@@ -28,8 +28,6 @@ iree_benchmark_suite_module_test(
   EXPECTED_OUTPUT
     "efficientnet_int8_expected_output.txt"
   MODULES
-    "riscv_32-Linux=iree_EfficientNet_int8_module_f963d812114af925e0a4b110ee83aeb0e3b41d49fad19b3f449b6a9ccba43b8d/module.vmfb"
-    "riscv_64-Linux=iree_EfficientNet_int8_module_e850fce2d36ddb09ccc34471641adb77418b93c0949d22ab75806d7cfc489ae3/module.vmfb"
     "x86_64-Linux=iree_EfficientNet_int8_module_3926415c1504dfc277674fee17bdfbd68090634b8b52620d8d5755082a89a16d/module.vmfb"
   RUNNER_ARGS
     "--function=main"
@@ -46,7 +44,6 @@ iree_benchmark_suite_module_test(
     "deeplab_v3_fp32_input_0_expected_output.npy"
   MODULES
     "arm_64-Android=iree_DeepLabV3_fp32_module_f06fff09f8cebc27d1674045712aaa60afe7aef388c4bc505897f55c3a0d8abb/module.vmfb"
-    "riscv_64-Linux=iree_DeepLabV3_fp32_module_68f0eb37bb72d0d6605ecdf42691c64125960e122844b0beeae350871a445b1c/module.vmfb"
     "x86_64-Linux=iree_DeepLabV3_fp32_module_87aead729018ce5f114501cecefb6315086eb2a21ae1b30984b1794f619871c6/module.vmfb"
   RUNNER_ARGS
     "--function=main"

diff --git a/third_party/llvm-project b/third_party/llvm-project
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo