From 44f6942796536a7cf2eee37ec383c9db74fa853f Mon Sep 17 00:00:00 2001
From: Sambhav Jain <sambhav.jain@getcruise.com>
Date: Tue, 28 Nov 2023 22:12:24 -0800
Subject: [PATCH] Bump LLVM and StableHLO (#2598)

Bump LLVM to `5e5a22caf88ac1ccfa8dc5720295fdeba0ad9372` and StableHLO to
`83f095e7217c897f1eccac5652600ceb944cb0e0`.

Bazel GHA:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7027647674
---
 externals/llvm-project                                | 2 +-
 externals/stablehlo                                   | 2 +-
 test/Conversion/TorchConversionToMLProgram/basic.mlir | 2 +-
 utils/bazel/WORKSPACE.bazel                           | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/externals/llvm-project b/externals/llvm-project
index 28b27c1b1..5e5a22caf 160000
--- a/externals/llvm-project
+++ b/externals/llvm-project
@@ -1 +1 @@
-Subproject commit 28b27c1b10ae8d1f5b4fb9df691e8cf0da9be3f6
+Subproject commit 5e5a22caf88ac1ccfa8dc5720295fdeba0ad9372
diff --git a/externals/stablehlo b/externals/stablehlo
index 77a59815a..83f095e72 160000
--- a/externals/stablehlo
+++ b/externals/stablehlo
@@ -1 +1 @@
-Subproject commit 77a59815a82b34f7b08ed2d42a711d9920682d0e
+Subproject commit 83f095e7217c897f1eccac5652600ceb944cb0e0
diff --git a/test/Conversion/TorchConversionToMLProgram/basic.mlir b/test/Conversion/TorchConversionToMLProgram/basic.mlir
index cc58ad3ac..c7fb38e1c 100644
--- a/test/Conversion/TorchConversionToMLProgram/basic.mlir
+++ b/test/Conversion/TorchConversionToMLProgram/basic.mlir
@@ -10,7 +10,7 @@
 // CHECK:           %[[NEXT_SEED:.*]] = arith.addi %[[MUL]], %[[INC]] : i64
 // CHECK:           %[[INSERTED:.*]] = tensor.insert %[[NEXT_SEED]] into %[[GLOBAL]][] : tensor<i64>
 // CHECK:           ml_program.global_store @global_seed = %[[INSERTED]] : tensor<i64>
-// CHECK:           return %2 : i64
+// CHECK:           return %[[NEXT_SEED]] : i64
 module {
   func.func @f() -> i64 {
     %seed = torch_c.get_next_seed : () -> i64
diff --git a/utils/bazel/WORKSPACE.bazel b/utils/bazel/WORKSPACE.bazel
index f7a81a4fa..351ba301c 100644
--- a/utils/bazel/WORKSPACE.bazel
+++ b/utils/bazel/WORKSPACE.bazel
@@ -33,6 +33,10 @@ llvm_configure(
     },
     targets = [
         "X86",
+        # The bazel dependency graph for mlir-opt fails to load (at the analysis step) without the NVPTX
+        # target in this list, because mlir/test:TestGPU depends on the //llvm:NVPTXCodeGen target,
+        # which is not defined unless this is included.
+        "NVPTX",
     ],
 )