From 480511ff95b21e2ec38fc0cb2e05a42869d34b09 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Mon, 22 Jan 2024 14:41:25 +0000 Subject: [PATCH] Integrate LLVM at llvm/llvm-project@3a82a1c3 Updates LLVM usage to match llvm/llvm-project@3a82a1c3. Further updates the StableHLO submodule to openxla/stablehlo@2025586. --- .github/workflows/build-and-test.yaml | 2 +- build_tools/llvm_version.txt | 2 +- test/Conversion/tosa-to-emitc.mlir | 4 ++-- third_party/stablehlo | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 9488e274..6e0e1533 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -12,7 +12,7 @@ env: EMITC: emitc LLVM: llvm E2E: emitc-e2e - E2E_VERSION: 2 + E2E_VERSION: 3 jobs: build-llvm: diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt index 4df9b944..9bcc2512 100644 --- a/build_tools/llvm_version.txt +++ b/build_tools/llvm_version.txt @@ -1 +1 @@ -ba4cf31facdaf9bb9943c057d325ff0968331e9a +3a82a1c3f6bdc9259cc4641f66fc76d1e171e382 diff --git a/test/Conversion/tosa-to-emitc.mlir b/test/Conversion/tosa-to-emitc.mlir index 7dbb183d..c5aed964 100644 --- a/test/Conversion/tosa-to-emitc.mlir +++ b/test/Conversion/tosa-to-emitc.mlir @@ -83,8 +83,8 @@ func.func @test_reciprocal(%arg0: tensor<13x21x3xf32>) -> tensor<13x21x3xf32> { } func.func @test_rescale(%arg0: tensor<13x21x3xui8>) -> tensor<13x21x3xi8> { - // CHECK: %0 = emitc.call_opaque "emitc::tosa::rescale"(%arg0) {args = [0 : index, 127 : i32, -1 : i32, array, array, true, false, false], template_args = [tensor<13x21x3xi8>, 1 : i32]} : (tensor<13x21x3xui8>) -> tensor<13x21x3xi8> - %0 = "tosa.rescale"(%arg0) {double_round = false, input_zp = 127 : i32, multiplier = array, output_zp = -1 : i32, per_channel = false, scale32 = true, shift = array} : (tensor<13x21x3xui8>) -> tensor<13x21x3xi8> + // CHECK: %0 = emitc.call_opaque "emitc::tosa::rescale"(%arg0) {args = [0 : index, 127 : i32, -1 : i32, array, array, true, false, false], template_args = [tensor<13x21x3xi8>, 1 : i32]} : (tensor<13x21x3xui8>) -> tensor<13x21x3xi8> + %0 = "tosa.rescale"(%arg0) {double_round = false, input_zp = 127 : i32, multiplier = array, output_zp = -1 : i32, per_channel = false, scale32 = true, shift = array} : (tensor<13x21x3xui8>) -> tensor<13x21x3xi8> return %0 : tensor<13x21x3xi8> } diff --git a/third_party/stablehlo b/third_party/stablehlo index 11804dd3..20255865 160000 --- a/third_party/stablehlo +++ b/third_party/stablehlo @@ -1 +1 @@ -Subproject commit 11804dd311bcb5630074cd48a67caad823385dd3 +Subproject commit 20255865ba299ed67bdf6267478c8477aef7a60d