Skip to content

Commit

Permalink
Integrate llvm-project and bump dependencies (iree-org#13412)
Browse files Browse the repository at this point in the history
  • Loading branch information
okkwon authored May 5, 2023
1 parent 04f0a45 commit 4e404d8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
7 changes: 7 additions & 0 deletions build_tools/cmake/test_riscv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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[*]}"))"
Expand Down
9 changes: 7 additions & 2 deletions build_tools/python/e2e_model_tests/test_definitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions tests/e2e/models/generated_e2e_model_tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion third_party/llvm-project
2 changes: 1 addition & 1 deletion third_party/mlir-hlo

0 comments on commit 4e404d8

Please sign in to comment.