remove

Author: lialan

mlir/include/mlir/Dialect/GPU/Transforms/Passes.h

@@ -92,7 +92,6 @@ inline void populateGpuRewritePatterns(RewritePatternSet &patterns) {
   populateGpuAllReducePatterns(patterns);
   populateGpuGlobalIdPatterns(patterns);
   populateGpuShufflePatterns(patterns);
-  populateGpuSubgroupIdPatterns(patterns);
 }
 
 namespace gpu {

mlir/lib/Dialect/GPU/Transforms/GlobalIdRewriter.cpp

@@ -26,7 +26,7 @@ struct GpuGlobalIdRewriter : public OpRewritePattern<gpu::GlobalIdOp> {
 
   LogicalResult matchAndRewrite(gpu::GlobalIdOp op,
                                 PatternRewriter &rewriter) const override {
-    auto loc = op.getLoc();
+    Location loc = op.getLoc();
     auto dim = op.getDimension();
     auto blockId = rewriter.create<gpu::BlockIdOp>(loc, dim);
     auto blockDim = rewriter.create<gpu::BlockDimOp>(loc, dim);

mlir/lib/Dialect/GPU/Transforms/SubgroupIdRewriter.cpp

@@ -1,4 +1,4 @@
-//===- SubgroupIdRewriter.cpp - Implementation of SubgroupId rewriting  ----===//
+//===- SubgroupIdRewriter.cpp - Implementation of SubgroupId rewriting ----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

mlir/test/Dialect/GPU/subgroupId-rewrite.mlir

@@ -1,26 +1,24 @@
 // RUN: mlir-opt --test-gpu-rewrite -split-input-file %s | FileCheck %s
 
-module {
-  // CHECK-LABEL: func.func @subgroupId
-  // CHECK-SAME: (%[[SZ:.*]]: index, %[[MEM:.*]]: memref<index, 1>) {
-  func.func @subgroupId(%sz : index, %mem: memref<index, 1>) {
-    gpu.launch blocks(%bx, %by, %bz) in (%grid_x = %sz, %grid_y = %sz, %grid_z = %sz)
-               threads(%tx, %ty, %tz) in (%block_x = %sz, %block_y = %sz, %block_z = %sz) {
-      // CHECK: %[[DIMX:.*]] = gpu.block_dim  x
-      // CHECK-NEXT: %[[DIMY:.*]] = gpu.block_dim  y
-      // CHECK-NEXT: %[[TIDX:.*]] = gpu.thread_id  x
-      // CHECK-NEXT: %[[TIDY:.*]] = gpu.thread_id  y
-      // CHECK-NEXT: %[[TIDZ:.*]] = gpu.thread_id  z
-      // CHECK-NEXT: %[[T0:.*]] = index.mul %[[DIMY]], %[[TIDZ]]
-      // CHECK-NEXT: %[[T1:.*]] = index.add %[[T0]], %[[TIDY]]
-      // CHECK-NEXT: %[[T2:.*]] = index.mul %[[DIMX]], %[[T1]]
-      // CHECK-NEXT: %[[T3:.*]] = index.add %[[TIDX]], %[[T2]]
-      // CHECK-NEXT: %[[T4:.*]] = gpu.subgroup_size : index
-      // CHECK-NEXT: %[[T5:.*]] = index.divu %[[T3]], %[[T4]]
-      %idz = gpu.subgroup_id : index
-      memref.store %idz, %mem[] : memref<index, 1>
-      gpu.terminator
-    }
-    return
+// CHECK-LABEL: func.func @subgroupId
+// CHECK-SAME: (%[[SZ:.*]]: index, %[[MEM:.*]]: memref<index, 1>) {
+func.func @subgroupId(%sz : index, %mem: memref<index, 1>) {
+  gpu.launch blocks(%bx, %by, %bz) in (%grid_x = %sz, %grid_y = %sz, %grid_z = %sz)
+             threads(%tx, %ty, %tz) in (%block_x = %sz, %block_y = %sz, %block_z = %sz) {
+    // CHECK: %[[DIMX:.*]] = gpu.block_dim  x
+    // CHECK-NEXT: %[[DIMY:.*]] = gpu.block_dim  y
+    // CHECK-NEXT: %[[TIDX:.*]] = gpu.thread_id  x
+    // CHECK-NEXT: %[[TIDY:.*]] = gpu.thread_id  y
+    // CHECK-NEXT: %[[TIDZ:.*]] = gpu.thread_id  z
+    // CHECK-NEXT: %[[T0:.*]] = index.mul %[[DIMY]], %[[TIDZ]]
+    // CHECK-NEXT: %[[T1:.*]] = index.add %[[T0]], %[[TIDY]]
+    // CHECK-NEXT: %[[T2:.*]] = index.mul %[[DIMX]], %[[T1]]
+    // CHECK-NEXT: %[[T3:.*]] = index.add %[[TIDX]], %[[T2]]
+    // CHECK-NEXT: %[[T4:.*]] = gpu.subgroup_size : index
+    // CHECK-NEXT: %[[T5:.*]] = index.divu %[[T3]], %[[T4]]
+    %idz = gpu.subgroup_id : index
+    memref.store %idz, %mem[] : memref<index, 1>
+    gpu.terminator
   }
+  return
 }

mlir/test/lib/Dialect/GPU/TestGpuRewrite.cpp

@@ -41,6 +41,7 @@ struct TestGpuRewritePass
   void runOnOperation() override {
     RewritePatternSet patterns(&getContext());
     populateGpuRewritePatterns(patterns);
+    populateGpuSubgroupIdPatterns(patterns);
     (void)applyPatternsGreedily(getOperation(), std::move(patterns));
   }
 };