From 04110a4b1c5dcf9bf403c3bfbb63968e462fc44f Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Tue, 2 Feb 2021 13:07:39 -0800 Subject: [PATCH] Integrate LLVM at llvm/llvm-project@67dfe9c8d70c Updates LLVM usage to match [67dfe9c8d70c](https://github.com/llvm/llvm-project/commit/67dfe9c8d70c) PiperOrigin-RevId: 355235205 --- WORKSPACE | 4 ++-- build_tools/llvm_version.txt | 2 +- tests/ops.mlir | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 7bb2ed5..6b6ca22 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,9 +15,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -LLVM_COMMIT = "4d904776a77aa80342c65cf72a962920cc9d1fa9" +LLVM_COMMIT = "67dfe9c8d70c1242c1e91e3bafc710781ac2a585" -LLVM_SHA256 = "02c7176c03cd5c1d12edef57fd118a7bf8140a5d002c7cf911cadf8d594d6745" +LLVM_SHA256 = "fbe06bc609e2dab7a2ab52679127b4ff6808a7b407c7f6aa24371ae2036686b4" LLVM_BAZEL_TAG = "llvm-project-{commit}".format(commit = LLVM_COMMIT) diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt index ea528cd..9b76a58 100644 --- a/build_tools/llvm_version.txt +++ b/build_tools/llvm_version.txt @@ -1,2 +1,2 @@ -4d904776a77aa80342c65cf72a962920cc9d1fa9 +67dfe9c8d70c1242c1e91e3bafc710781ac2a585 diff --git a/tests/ops.mlir b/tests/ops.mlir index 5a0e545..76d8896 100644 --- a/tests/ops.mlir +++ b/tests/ops.mlir @@ -361,7 +361,7 @@ func @concat_1D_unranked(%arg0: tensor<1xi32>, %arg1: tensor<*xi32>) -> tensor< // ----- func @concat_1D_unranked_error(%arg0: tensor<1xi32>, %arg1: tensor<*xi32>) -> tensor<3xi32> { - // expected-error@+1 {{'mhlo.concatenate' op inferred type incompatible with return type of operation}} + // expected-error@+1 {{op inferred type(s) 'tensor<*xi32>' are incompatible with return type(s) of operation 'tensor<3xi32>'}} %0 = "mhlo.concatenate"(%arg0, %arg1) { dimension = 0 : i64 } : (tensor<1xi32>, tensor<*xi32>) -> tensor<3xi32> return %0 : tensor<3xi32> } @@ -369,7 +369,7 @@ func @concat_1D_unranked_error(%arg0: tensor<1xi32>, %arg1: tensor<*xi32>) -> t // ----- func @concat_1D_error(%arg0: tensor<1xi32>, %arg1: tensor<2xi32>) -> tensor<4xi32> { - // expected-error@+1 {{'mhlo.concatenate' op inferred type incompatible with return type of operation}} + // expected-error@+1 {{op inferred type(s) 'tensor<3xi32>' are incompatible with return type(s) of operation 'tensor<4xi32>'}} %0 = "mhlo.concatenate"(%arg0, %arg1) { dimension = 0 : i64 } : (tensor<1xi32>, tensor<2xi32>) -> tensor<4xi32> return %0 : tensor<4xi32> }