From 3111eb737b7267d21e5803c1f1a61482cfa3b7bb Mon Sep 17 00:00:00 2001
From: iree-copybara-bot <iree-copybara-bot@google.com>
Date: Tue, 17 Nov 2020 22:05:02 -0800
Subject: [PATCH] Integrate LLVM at llvm/llvm-project@b2613fb2f0f5

Updates LLVM usage to match
[b2613fb2f0f5](https://github.com/llvm/llvm-project/commit/b2613fb2f0f5)

PiperOrigin-RevId: 343012713
---
 SUBMODULE_VERSIONS                                     |  2 +-
 .../LinalgToSPIRV/test/convert_to_spirv.mlir           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index ec3786900f75..3d7855847c60 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -6,7 +6,7 @@ a5d9d0f7d368054fd1691aedf1db4116efcc233e third_party/flatbuffers
 4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc
 f2fb48c3b3d79a75a88a99fba6576b25d42ec528 third_party/googletest
 9c04d22c6068ec07d25e236b14e3362f3e5efc2c third_party/llvm-bazel
-499bce3abab8a362b9b4197944bd40b826c736c4 third_party/llvm-project
+b2613fb2f0f53691dd0211895afbb9413457fca7 third_party/llvm-project
 55801f03f9cc69abfcf8b508a873f702c11b3b5f third_party/mlir-emitc
 74d7261be17cf659d5930d4830609406bd7553e3 third_party/pffft
 d8c7ee00a687ac369e62e2032514a93a9b413502 third_party/pybind11
diff --git a/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir b/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir
index 0be6dc48ae03..ea292d3d28a7 100644
--- a/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir
+++ b/iree/compiler/Conversion/LinalgToSPIRV/test/convert_to_spirv.mlir
@@ -6,7 +6,7 @@ module attributes {spv.target_env = #spv.target_env<#spv.vce<v1.3, [Shader], [SP
   func @push_constant() {
     // CHECK: %[[INDEX_0:.+]] = spv.constant 0 : i32
     // CHECK: %[[INDEX_1:.+]] = spv.constant 2 : i32
-    // CHECK: %[[ADDR:.+]] = spv._address_of @__push_constant_var__ : !spv.ptr<!spv.struct<(!spv.array<5 x i32, stride=4> [0])>, PushConstant>
+    // CHECK: %[[ADDR:.+]] = spv.mlir.addressof @__push_constant_var__ : !spv.ptr<!spv.struct<(!spv.array<5 x i32, stride=4> [0])>, PushConstant>
     // CHECK: %[[AC:.+]] = spv.AccessChain %[[ADDR]][%[[INDEX_0]], %[[INDEX_1]]] : !spv.ptr<!spv.struct<(!spv.array<5 x i32, stride=4> [0])>, PushConstant>
     // CHECK: spv.Load "PushConstant" %[[AC]] : i32
     %0 = hal.interface.load.constant offset = 2 : index
@@ -49,8 +49,8 @@ module attributes {spv.target_env = #spv.target_env<#spv.vce<v1.3, [Shader], [SP
 
   // CHECK: spv.func @resource_bindings_in_entry_func1()
   func @resource_bindings_in_entry_func1() {
-    // CHECK: spv._address_of @[[FUNC1_ARG:.+]]
-    // CHECK: spv._address_of @[[FUNC1_RET:.+]]
+    // CHECK: spv.mlir.addressof @[[FUNC1_ARG:.+]]
+    // CHECK: spv.mlir.addressof @[[FUNC1_RET:.+]]
     %0 = iree.placeholder for "interface buffer" {binding = @legacy_io::@arg0} : memref<4x4xf32>
     %1 = iree.placeholder for "interface buffer" {binding = @legacy_io::@ret0} : memref<4xvector<4xf32>>
     return
@@ -58,8 +58,8 @@ module attributes {spv.target_env = #spv.target_env<#spv.vce<v1.3, [Shader], [SP
 
   // CHECK: spv.func @resource_bindings_in_entry_func2()
   func @resource_bindings_in_entry_func2() {
-    // CHECK: spv._address_of @[[FUNC2_ARG]]
-    // CHECK: spv._address_of @[[FUNC2_RET]]
+    // CHECK: spv.mlir.addressof @[[FUNC2_ARG]]
+    // CHECK: spv.mlir.addressof @[[FUNC2_RET]]
     %0 = iree.placeholder for "interface buffer" {binding = @legacy_io::@arg0} : memref<4x4xf32>
     %1 = iree.placeholder for "interface buffer" {binding = @legacy_io::@ret0} : memref<4x4xf32>
     return