[AMDGPU] Do not generate mul with 1 in AMDGPU Atomic Optimizer

[mbrkusanin]

Summary

Check if operand of mul is constant value of one for certain atomic
instructions in order to avoid making unnecessary instructions when
-amdgpu-atomic-optimizer is present.

[arsenm]

llvm/test/CodeGen/AMDGPU/atomic_optimizations_mul_one.mir

1

It's weird to use MIR and -run-pass for an IR pass. Should have regular ll test, with an end to end llc line and an opt line for just the pass

[foad]

llvm/lib/Target/AMDGPU/AMDGPUAtomicOptimizer.cpp

407

It would be neater to have a BuildMul helper function that checks for and optimizes the mul-by-1 case.

[mbrkusanin]

• Changed test to opt + llc global-isel (SDag was already removing these mul instructions, just later on). Should I split the file into two tests?

[mbrkusanin]

llvm/lib/Target/AMDGPU/AMDGPUAtomicOptimizer.cpp

407

A new BuildMul or update the current one (looks like some unittests need to be updated in this case)?

[foad]

llvm/lib/Target/AMDGPU/AMDGPUAtomicOptimizer.cpp

407

I was suggesting a new BuildMul helper function in this source file, not changing IRBuilder at all.

[mbrkusanin]

• Added buildMul that checks for mul with 1.

[arsenm]

llvm/test/CodeGen/AMDGPU/GlobalISel/atomic_optimizations_mul_one.ll

7–10 ↗

(On Diff #294714)

These negative checks are extremely fragile. These should use positive checks

[mbrkusanin]

• Updated llc test check lines.

llvm/test/CodeGen/AMDGPU/GlobalISel/atomic_optimizations_mul_one.ll

7–10 ↗

(On Diff #294714)

Just llc or opt check lines as well?

[arsenm]

llvm/test/CodeGen/AMDGPU/GlobalISel/atomic_optimizations_mul_one.ll

7–10 ↗

(On Diff #294714)

Both. Negative checks are just too easy to get wrong

[mbrkusanin]

• Updated opt test check lines.

llvm/lib/Target/AMDGPU/AMDGPUAtomicOptimizer.cpp

case AtomicRMWInst::UMin:
     return APInt::getMaxValue(BitWidth);
   case AtomicRMWInst::Max:
     return APInt::getSignedMinValue(BitWidth);
   case AtomicRMWInst::Min:
     return APInt::getSignedMaxValue(BitWidth);
   }
 }
 
+static bool isConstantOne(const Value* V) {
+  const ConstantInt *CI = dyn_cast<ConstantInt>(V);
+  return CI && CI->isOne();
+}
+
 void AMDGPUAtomicOptimizer::optimizeAtomic(Instruction &I,
                                            AtomicRMWInst::BinOp Op,
                                            unsigned ValIdx,
                                            bool ValDivergent) const {
   // Start building just before the instruction.
   IRBuilder<> B(&I);
 
   // If we are in a pixel shader, because of how we have to mask out helper
default:
       llvm_unreachable("Unhandled atomic op");
 
     case AtomicRMWInst::Add:
     case AtomicRMWInst::Sub: {
       // The new value we will be contributing to the atomic operation is the
       // old value times the number of active lanes.
       Value *const Ctpop = B.CreateIntCast(
           B.CreateUnaryIntrinsic(Intrinsic::ctpop, Ballot), Ty, false);
-      NewV = B.CreateMul(V, Ctpop);
+      NewV = isConstantOne(V) ? Ctpop : B.CreateMul(V, Ctpop);
       break;
     }
 
     case AtomicRMWInst::And:
     case AtomicRMWInst::Or:
     case AtomicRMWInst::Max:
     case AtomicRMWInst::Min:
     case AtomicRMWInst::UMax:
     case AtomicRMWInst::UMin:
       // These operations with a uniform value are idempotent: doing the atomic
       // operation multiple times has the same effect as doing it once.
       NewV = V;
       break;
 
     case AtomicRMWInst::Xor:
       // The new value we will be contributing to the atomic operation is the
       // old value times the parity of the number of active lanes.
       Value *const Ctpop = B.CreateIntCast(
           B.CreateUnaryIntrinsic(Intrinsic::ctpop, Ballot), Ty, false);
-      NewV = B.CreateMul(V, B.CreateAnd(Ctpop, 1));
+      NewV = isConstantOne(V) ? B.CreateAnd(Ctpop, 1)
+                              : B.CreateMul(V, B.CreateAnd(Ctpop, 1));
       break;
     }
   }
 
   // We only want a single lane to enter our new control flow, and we do this
   // by checking if there are any active lanes below us. Only one lane will
   // have 0 active lanes below us, so that will be the only one to progress.
   Value *const Cond = B.CreateICmpEQ(Mbcnt, B.getIntN(TyBitWidth, 0));
if (NeedResult) {
     if (ValDivergent) {
       LaneOffset = B.CreateIntrinsic(Intrinsic::amdgcn_wwm, Ty, ExclScan);
     } else {
       switch (Op) {
       default:
         llvm_unreachable("Unhandled atomic op");
       case AtomicRMWInst::Add:
       case AtomicRMWInst::Sub:
-        LaneOffset = B.CreateMul(V, Mbcnt);
+        LaneOffset = isConstantOne(V) ? Mbcnt : B.CreateMul(V, Mbcnt);
         break;
       case AtomicRMWInst::And:
       case AtomicRMWInst::Or:
       case AtomicRMWInst::Max:
       case AtomicRMWInst::Min:
       case AtomicRMWInst::UMax:
       case AtomicRMWInst::UMin:
         LaneOffset = B.CreateSelect(Cond, Identity, V);
         break;
       case AtomicRMWInst::Xor:
-        LaneOffset = B.CreateMul(V, B.CreateAnd(Mbcnt, 1));
+        LaneOffset = isConstantOne(V) ? B.CreateAnd(Mbcnt, 1)
+                                      : B.CreateMul(V, B.CreateAnd(Mbcnt, 1));
         break;
       }
     }
     Value *const Result = buildNonAtomicBinOp(B, Op, BroadcastI, LaneOffset);
 
     if (IsPixelShader) {
       // Need a final PHI to reconverge to above the helper lane branch mask.
       B.SetInsertPoint(PixelExitBB->getFirstNonPHI());

llvm/test/CodeGen/AMDGPU/atomic_optimizations_mul_one.mir

+# RUN: llc -O0 -mtriple=amdgcn -run-pass=amdgpu-atomic-optimizer %s -o - | FileCheck %s
+
+--- |
+
+  declare i32 @llvm.amdgcn.struct.buffer.atomic.add.i32(i32, <4 x i32>, i32, i32, i32, i32 immarg) #0
+  declare i32 @llvm.amdgcn.struct.buffer.atomic.sub.i32(i32, <4 x i32>, i32, i32, i32, i32 immarg) #0
+  declare i32 @llvm.amdgcn.struct.buffer.atomic.xor.i32(i32, <4 x i32>, i32, i32, i32, i32 immarg) #0
+  declare void @llvm.amdgcn.struct.buffer.store.format.v4i32(<4 x i32>, <4 x i32>, i32, i32, i32, i32 immarg) #1
+
+  ; CHECK-NOT: mul i32 1, %[[REG:[0-9]+]]
+  ; CHECK-NOT: mul i32 %[[REG:[0-9]+]], 1
+
+  define amdgpu_cs void @atomic_add(<4 x i32> inreg %arg1) {
+  .entry:
+    %0 = call i32 @llvm.amdgcn.struct.buffer.atomic.add.i32(i32 1, <4 x i32> %arg1, i32 0, i32 0, i32 0, i32 0)
+    ret void
+  }
+
+  define amdgpu_cs void @atomic_add_and_format(<4 x i32> inreg %arg) {
+  .entry:
+    %a = call i32 @llvm.amdgcn.struct.buffer.atomic.add.i32(i32 1, <4 x i32> %arg, i32 0, i32 0, i32 0, i32 0)
+    call void @llvm.amdgcn.struct.buffer.store.format.v4i32(<4 x i32> %arg, <4 x i32> %arg, i32 %a, i32 0, i32 0, i32 0)
+    ret void
+  }
+
+  define amdgpu_cs void @atomic_sub(<4 x i32> inreg %arg1) {
+  .entry:
+    %0 = call i32 @llvm.amdgcn.struct.buffer.atomic.sub.i32(i32 1, <4 x i32> %arg1, i32 0, i32 0, i32 0, i32 0)
+    ret void
+  }
+
+  define amdgpu_cs void @atomic_sub_and_format(<4 x i32> inreg %arg) {
+  .entry:
+    %a = call i32 @llvm.amdgcn.struct.buffer.atomic.sub.i32(i32 1, <4 x i32> %arg, i32 0, i32 0, i32 0, i32 0)
+    call void @llvm.amdgcn.struct.buffer.store.format.v4i32(<4 x i32> %arg, <4 x i32> %arg, i32 %a, i32 0, i32 0, i32 0)
+    ret void
+  }
+
+  define amdgpu_cs void @atomic_xor(<4 x i32> inreg %arg1) {
+  .entry:
+    %0 = call i32 @llvm.amdgcn.struct.buffer.atomic.xor.i32(i32 1, <4 x i32> %arg1, i32 0, i32 0, i32 0, i32 0)
+    ret void
+  }
+
+  define amdgpu_cs void @atomic_xor_and_format(<4 x i32> inreg %arg) {
+  .entry:
+    %a = call i32 @llvm.amdgcn.struct.buffer.atomic.xor.i32(i32 1, <4 x i32> %arg, i32 0, i32 0, i32 0, i32 0)
+    call void @llvm.amdgcn.struct.buffer.store.format.v4i32(<4 x i32> %arg, <4 x i32> %arg, i32 %a, i32 0, i32 0, i32 0)
+    ret void
+  }
+
+  attributes #0 = { nounwind willreturn }
+  attributes #1 = { nounwind willreturn writeonly }
+
+...