[Mlir-commits] [mlir] 98dbc68 - Revert "[mlir] Lower math dialect later in gpu-lower-to-nvvm-pipeline (#78556)"

[Benjamin Kramer]

Author: Benjamin Kramer
Date: 2024-01-31T17:41:21+01:00
New Revision: 98dbc688de90cd7019dad32356b466a896b0d2ff

URL: https://github.com/llvm/llvm-project/commit/98dbc688de90cd7019dad32356b466a896b0d2ff
DIFF: https://github.com/llvm/llvm-project/commit/98dbc688de90cd7019dad32356b466a896b0d2ff.diff

LOG: Revert "[mlir] Lower math dialect later in gpu-lower-to-nvvm-pipeline (#78556)"

This reverts commit 74bf0b1cd9dde53b2df08966bcf2f91d4909ccd6. The test
always fails.

 | mlir/test/Dialect/GPU/test-nvvm-pipeline.mlir:23:16: error: CHECK-PTX: expected string not found in input
 |  // CHECK-PTX: __nv_expf

https://lab.llvm.org/buildbot/#/builders/61/builds/53789

Added: 
    

Modified: 
    mlir/lib/Dialect/GPU/Pipelines/GPUToNVVMPipeline.cpp

Removed: 
    mlir/test/Dialect/GPU/test-nvvm-pipeline.mlir


################################################################################
diff  --git a/mlir/lib/Dialect/GPU/Pipelines/GPUToNVVMPipeline.cpp b/mlir/lib/Dialect/GPU/Pipelines/GPUToNVVMPipeline.cpp
index 935f0deaf9c8a..0b4739214bf2f 100644
--- a/mlir/lib/Dialect/GPU/Pipelines/GPUToNVVMPipeline.cpp
+++ b/mlir/lib/Dialect/GPU/Pipelines/GPUToNVVMPipeline.cpp
@@ -51,6 +51,7 @@ void buildCommonPassPipeline(
   pm.addPass(createConvertVectorToSCFPass());
   pm.addPass(createConvertSCFToCFPass());
   pm.addPass(createConvertNVVMToLLVMPass());
+  pm.addPass(createConvertMathToLLVMPass());
   pm.addPass(createConvertFuncToLLVMPass());
   pm.addPass(memref::createExpandStridedMetadataPass());
 
@@ -97,7 +98,6 @@ void buildHostPostPipeline(OpPassManager &pm,
   GpuModuleToBinaryPassOptions gpuModuleToBinaryPassOptions;
   gpuModuleToBinaryPassOptions.compilationTarget = options.cubinFormat;
   pm.addPass(createGpuModuleToBinaryPass(gpuModuleToBinaryPassOptions));
-  pm.addPass(createConvertMathToLLVMPass());
   pm.addPass(createCanonicalizerPass());
   pm.addPass(createCSEPass());
   pm.addPass(createReconcileUnrealizedCastsPass());

diff  --git a/mlir/test/Dialect/GPU/test-nvvm-pipeline.mlir b/mlir/test/Dialect/GPU/test-nvvm-pipeline.mlir
deleted file mode 100644
index fde99ab105d68..0000000000000
--- a/mlir/test/Dialect/GPU/test-nvvm-pipeline.mlir
+++ /dev/null
@@ -1,29 +0,0 @@
-// RUN: mlir-opt %s \
-// RUN:  | mlir-opt -gpu-lower-to-nvvm-pipeline="cubin-format=isa" \ 
-// RUN:    -split-input-file | FileCheck %s
-
-// RUN: mlir-opt %s \
-// RUN:  | mlir-opt -gpu-lower-to-nvvm-pipeline="cubin-format=isa" \ 
-// RUN:    -split-input-file -debug-only=serialize-to-isa \
-// RUN:    2>&1 | FileCheck %s --check-prefixes=CHECK-PTX
-
-// This test checks whether the GPU region is compiled correctly to PTX by 
-// pipeline. It doesn't test IR for GPU side, but it can test Host IR and 
-// generated PTX.
-
-// CHECK-LABEL: llvm.func @test_math(%arg0: f32) {
-func.func @test_math(%arg0 : f32) {
-    %c2 = arith.constant 2 : index
-    %c1 = arith.constant 1 : index
-    // CHECK: gpu.launch_func  @test_math_kernel::@test_math_kernel
-    // CHECK: gpu.binary @test_math_kernel  [#gpu.object<#nvvm.target
-    gpu.launch 
-        blocks(%0, %1, %2) in (%3 = %c1, %4 = %c1, %5 = %c1) 
-        threads(%6, %7, %8) in (%9 = %c2, %10 = %c1, %11 = %c1) { 
-        // CHECK-PTX: __nv_expf 
-        %s1 = math.exp %arg0 : f32
-        gpu.printf "%f" %s1 : f32
-        gpu.terminator
-    }
-    return
-}