Integrate LLVM to llvm/llvm-project@6c2e170d (#20109)

There are some attribute changes upstream:

- TOSA: llvm/llvm-project#128115
- NVPTX: llvm/llvm-project#127736

---------

Signed-off-by: yzhang93 <[email protected]>

Author: yzhang93

compiler/plugins/target/CUDA/CUDATarget.cpp

@@ -32,6 +32,7 @@
 #include "llvm/Passes/StandardInstrumentations.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/TargetSelect.h"
@@ -530,18 +531,6 @@ class CUDATargetBackend final : public TargetBackend {
         // Sanitize the function name as PTX has strict requirements.
         llvmFunc->setName(sanitizeSymbolName(funcOp.getName()));
 
-        auto *annotations =
-            llvmModule->getOrInsertNamedMetadata("nvvm.annotations");
-        auto setMetadataValueI32 = [&](StringRef name, int value) {
-          llvm::Metadata *llvmMetadata[] = {
-              llvm::ValueAsMetadata::get(llvmFunc),
-              llvm::MDString::get(llvmModule->getContext(), name),
-              llvm::ValueAsMetadata::get(llvm::ConstantInt::get(
-                  llvm::Type::getInt32Ty(llvmModule->getContext()), value))};
-          annotations->addOperand(
-              llvm::MDNode::get(llvmModule->getContext(), llvmMetadata));
-        };
-
         // Mark the entry point as a kernel.
         llvmFunc->setCallingConv(llvm::CallingConv::PTX_Kernel);
 
@@ -560,9 +549,10 @@ class CUDATargetBackend final : public TargetBackend {
           maxWorkgroupSize[0] = std::max(maxWorkgroupSize[0], workgroupSize[0]);
           maxWorkgroupSize[1] = std::max(maxWorkgroupSize[1], workgroupSize[1]);
           maxWorkgroupSize[2] = std::max(maxWorkgroupSize[2], workgroupSize[2]);
-          setMetadataValueI32("maxntidx", workgroupSize[0]);
-          setMetadataValueI32("maxntidy", workgroupSize[1]);
-          setMetadataValueI32("maxntidz", workgroupSize[2]);
+          std::string maxntid = llvm::formatv(
+              "{0},{1},{2}", llvm::utostr(workgroupSize[0]),
+              llvm::utostr(workgroupSize[1]), llvm::utostr(workgroupSize[2]));
+          llvmFunc->addFnAttr("nvvm.maxntid", maxntid);
         }
       }
 

tests/e2e/tosa_ops/transpose.mlir

@@ -1,7 +1,6 @@
 func.func @test_transpose() {
   %0 = arith.constant dense<[[[0, 1, 2], [3, 4, 5]]]> : tensor<1x2x3xi32>
-  %1 = arith.constant dense<[1, 2, 0]> : tensor<3xi32>
-  %2 = tosa.transpose %0, %1 : (tensor<1x2x3xi32>, tensor<3xi32>) -> (tensor<2x3x1xi32>)
-  check.expect_eq_const(%2, dense<[[[0], [1], [2]], [[3], [4], [5]]]> : tensor<2x3x1xi32>) : tensor<2x3x1xi32>
+  %1 = tosa.transpose %0 { perms = array<i32: 1, 2, 0> }: (tensor<1x2x3xi32>) -> (tensor<2x3x1xi32>)
+  check.expect_eq_const(%1, dense<[[[0], [1], [2]], [[3], [4], [5]]]> : tensor<2x3x1xi32>) : tensor<2x3x1xi32>
   return
 }