[llvm] 3eecc83 - AMDGPU: Use default attributes on image dim intrinsics

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2022-12-30T08:31:26-05:00
New Revision: 3eecc83897d49689b69988e92a75f668a0a3e726

URL: https://github.com/llvm/llvm-project/commit/3eecc83897d49689b69988e92a75f668a0a3e726
DIFF: https://github.com/llvm/llvm-project/commit/3eecc83897d49689b69988e92a75f668a0a3e726.diff

LOG: AMDGPU: Use default attributes on image dim intrinsics

These were missing nocallback and willreturn

Added: 
    

Modified: 
    llvm/include/llvm/IR/IntrinsicsAMDGPU.td

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/IR/IntrinsicsAMDGPU.td b/llvm/include/llvm/IR/IntrinsicsAMDGPU.td
index 2e63213269547..3404b17bd4e60 100644
--- a/llvm/include/llvm/IR/IntrinsicsAMDGPU.td
+++ b/llvm/include/llvm/IR/IntrinsicsAMDGPU.td
@@ -793,7 +793,7 @@ class AMDGPUImageDimIntrinsicEval<AMDGPUDimProfile P_> {
 // All dimension-aware intrinsics are derived from this class.
 class AMDGPUImageDimIntrinsic<AMDGPUDimProfile P_,
                               list<IntrinsicProperty> props,
-                              list<SDNodeProperty> sdnodeprops> : Intrinsic<
+                              list<SDNodeProperty> sdnodeprops> : DefaultAttrsIntrinsic<
     P_.RetTypes,        // vdata(VGPR) -- for load/atomic-with-return
     !listconcat(
       !foreach(arg, P_.DataArgs, arg.Type),      // vdata(VGPR) -- for store/atomic
@@ -808,7 +808,6 @@ class AMDGPUImageDimIntrinsic<AMDGPUDimProfile P_,
      !listconcat(props,
           !if(P_.IsAtomic, [], [ImmArg<ArgIndex<AMDGPUImageDimIntrinsicEval<P_>.DmaskArgIndex>>]),
           !if(P_.IsSample, [ImmArg<ArgIndex<AMDGPUImageDimIntrinsicEval<P_>.UnormArgIndex>>], []),
-          [IntrWillReturn],
           [ImmArg<ArgIndex<AMDGPUImageDimIntrinsicEval<P_>.TexFailCtrlArgIndex>>,
            ImmArg<ArgIndex<AMDGPUImageDimIntrinsicEval<P_>.CachePolicyArgIndex>>]),