Reimplement UAddc with simplified named struct handling

Author: Icohedron

llvm/lib/Target/DirectX/DXIL.td

@@ -741,9 +741,7 @@ def UMin : DXILOp<40, binary> {
 
 def UAddc : DXILOp<44, binaryWithCarryOrBorrow > {
   let Doc = "Unsigned 32-bit integer arithmetic add with carry. uaddc(a,b) = (a+b, a+b overflowed ? 1 : 0)";
-  // TODO: This `let intrinsics = ...` line may be uncommented when 
-  // https://github.com/llvm/llvm-project/issues/113192 is fixed
-  // let intrinsics = [IntrinSelect<int_uadd_with_overflow>];
+  let intrinsics = [IntrinSelect<int_uadd_with_overflow>];
   let arguments = [OverloadTy, OverloadTy];
   let result = BinaryWithCarryTy;
   let overloads = [Overloads<DXIL1_0, [Int32Ty]>];

llvm/lib/Target/DirectX/DXILOpBuilder.cpp

@@ -545,10 +545,6 @@ StructType *DXILOpBuilder::getResRetType(Type *ElementTy) {
   return ::getResRetType(ElementTy);
 }
 
-StructType *DXILOpBuilder::getBinaryWithCarryType(LLVMContext &Context) {
-  return ::getBinaryWithCarryType(Context);
-}
-
 StructType *DXILOpBuilder::getHandleType() {
   return ::getHandleType(IRB.getContext());
 }

llvm/lib/Target/DirectX/DXILOpBuilder.h

@@ -50,9 +50,6 @@ class DXILOpBuilder {
   /// Get a `%dx.types.ResRet` type with the given element type.
   StructType *getResRetType(Type *ElementTy);
 
-  /// Get the `%dx.types.i32c` type.
-  StructType *getBinaryWithCarryType(LLVMContext &Context);
-
   /// Get the `%dx.types.Handle` type.
   StructType *getHandleType();
 

llvm/lib/Target/DirectX/DXILOpLowering.cpp

@@ -818,15 +818,6 @@ class OpLowerer {
       case Intrinsic::dx_resource_updatecounter:
         HasErrors |= lowerUpdateCounter(F);
         break;
-      // TODO: this can be removed when
-      // https://github.com/llvm/llvm-project/issues/113192 is fixed
-      case Intrinsic::uadd_with_overflow:
-        HasErrors |= replaceFunctionWithNamedStructOp(
-            F, OpCode::UAddc, OpBuilder.getBinaryWithCarryType(M.getContext()),
-            [&](CallInst *CI, CallInst *Op) {
-              return replaceAggregateTypeOfCallUsages(CI, Op);
-            });
-        break;
       case Intrinsic::ctpop:
         HasErrors |= lowerCtpopToCountBits(F);
         break;

llvm/test/CodeGen/DirectX/UAddc_errors.ll

@@ -19,7 +19,7 @@ define noundef i16 @uaddc_i16(i16 noundef %a, i16 noundef %b) "hlsl.export" {
 
 ; CHECK: error:
 ; CHECK-SAME: in function uaddc_return
-; CHECK-SAME: llvm.uadd.with.overflow.i32 use is not a ExtractValueInst or InsertValueInst
+; CHECK-SAME: DXIL ops that return structs may only be used by insert- and extractvalue
 
 define noundef { i32, i1 } @uaddc_return(i32 noundef %a, i32 noundef %b) "hlsl.export" {
   %uaddc = call { i32, i1 } @llvm.uadd.with.overflow.i32(i32 %a, i32 %b)