diff --git a/WORKSPACE b/WORKSPACE index 815baed..8d8acbc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,9 +15,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -LLVM_COMMIT = "f8de9aaef2f472ad7572748582444083d31d5a95" +LLVM_COMMIT = "4b13b7581db59adbc0ee4bbf269f3eda96fc9bd7" -LLVM_SHA256 = "577e77afb764eff514ba5c8fdf8ad86fd9b2e073d06df055d9c6bb42fcfd6b20" +LLVM_SHA256 = "7ed9f26d79ddb7fa269b99174e8d9a1ae1e28a46a175e7e019372011a57fb7b1" 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 abfece2..b89dbf6 100644 --- a/build_tools/llvm_version.txt +++ b/build_tools/llvm_version.txt @@ -1,2 +1,2 @@ -f8de9aaef2f472ad7572748582444083d31d5a95 +4b13b7581db59adbc0ee4bbf269f3eda96fc9bd7 diff --git a/tests/lhlo-legalize-select-and-scatter.mlir b/tests/lhlo-legalize-select-and-scatter.mlir index 78f894f..fc25084 100644 --- a/tests/lhlo-legalize-select-and-scatter.mlir +++ b/tests/lhlo-legalize-select-and-scatter.mlir @@ -102,8 +102,8 @@ func @select_and_scatter(%arg: memref<112x112xf32>, // INBOUNDS-THEN-BODY, i.e. if INBOUNDS == true // CHECK: [[ARG_ELEM:%.*]] = memref.load [[ARG_BUF]]{{\[}}[[ARG_I]], [[ARG_J]]] - // CHECK: [[IF_INIT_RES:%.*]]:4 - // CHECK-SAME: = scf.if [[SEL_INIT]] -> (index, index, f32, i1) { + // CHECK: [[IF_INIT_RES:%.*]]:3 + // CHECK-SAME: = scf.if [[SEL_INIT]] -> (index, index, f32) { // INIT-THEN-BODY, i.e. INBOUNDS == true and INIT = true @@ -130,21 +130,20 @@ func @select_and_scatter(%arg: memref<112x112xf32>, // CHECK: [[IF_PRED_RES0:%.*]] = select [[PRED]], [[ARG_I]], [[SEL_I]] // CHECK: [[IF_PRED_RES1:%.*]] = select [[PRED]], [[ARG_J]], [[SEL_J]] // CHECK: [[IF_PRED_RES2:%.*]] = select [[PRED]], [[ARG_ELEM]], [[SEL_VAL]] - // CHECK: [[IF_PRED_RES3:%.*]] = select [[PRED]], [[CTRUE]], [[SEL_INIT]] // INIT-THEN-BODY yield. // CHECK: scf.yield [[IF_PRED_RES0]], [[IF_PRED_RES1]], - // CHECK-SAME: [[IF_PRED_RES2]], [[IF_PRED_RES3]] + // CHECK-SAME: [[IF_PRED_RES2]] // INIT-ELSE-BODY, i.e. if INBOUNDS == TRUE and INIT == FALSE, returns ARG // ivs and element without computing Select function. - // CHECK: scf.yield [[ARG_I]], [[ARG_J]], [[ARG_ELEM]], - // CHECK-SAME: [[CTRUE]] : index, index, f32, i1 + // CHECK: scf.yield [[ARG_I]], [[ARG_J]], [[ARG_ELEM]] + // CHECK-SAME: : index, index, f32 // CHECK: } // INBOUNDS-THEN-BODY yield. - // CHECK: scf.yield [[IF_INIT_RES]]#0, [[IF_INIT_RES]]#1, [[IF_INIT_RES]]#2, - // CHECK-SAME: [[IF_INIT_RES]]#3 : index, index, f32, i1 + // CHECK: scf.yield [[IF_INIT_RES]]#0, [[IF_INIT_RES]]#1, [[IF_INIT_RES]]#2 + // CHECK-SAME: : index, index, f32 // CHECK: } // INBOUNDS-ELSE-REGION, i.e. if INBOUNDS == FALSE