addressed suggested changes

Author: niconunezz

llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp

@@ -1352,6 +1352,9 @@ SILoadStoreOptimizer::checkAndPrepareMerge(CombineInfo &CI,
                                               DataRC1, SubReg);
     }
 
+    if (Data0->getReg().isPhysical() || Data1->getReg().isPhysical()) {
+      return nullptr;
+    }
     bool canBeConstrainedData0 =
         MRI->constrainRegClass(Data0->getReg(), DataRC0);
     bool canBeConstrainedData1 =

llvm/test/CodeGen/AMDGPU/load-store-opt-ds-regclass-constrain.mir

@@ -217,18 +217,17 @@ body:             |
     ; CHECK-LABEL: name: ds_write_b32__av32_physical
     ; CHECK: liveins: $vgpr0, $vgpr1, $vgpr2
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:vgpr_32 = COPY $vgpr1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:vgpr_32 = COPY $vgpr2
-    ; CHECK-NEXT: DS_WRITE2_B32_gfx9 [[COPY]], [[COPY1]], [[COPY2]], 10, 24, 0, implicit $exec :: (store (s32), addrspace 3)
+    ; CHECK-NEXT:   %0:vgpr_32 = COPY $vgpr0
+    ; CHECK-NEXT:   %1:av_32 = COPY $vgpr1
+    ; CHECK-NEXT:   DS_WRITE_B32_gfx9 %0, %1, 40, 0, implicit $exec :: (store (s32), addrspace 3)
+    ; CHECK-NEXT:   DS_WRITE_B32_gfx9 %0, $vgpr2, 96, 0, implicit $exec :: (store (s32), addrspace 3)
+
   %0:vgpr_32 = COPY $vgpr0
   %1:av_32 = COPY $vgpr1
   DS_WRITE_B32_gfx9 %0, %1, 40, 0, implicit $exec :: (store (s32), addrspace 3)
   DS_WRITE_B32_gfx9 %0, $vgpr2, 96, 0, implicit $exec :: (store (s32), addrspace 3)
 ...
 
-...
-
 ---
 name:            ds_write_b32__physical_av32
 body:             |
@@ -238,54 +237,13 @@ body:             |
     ; CHECK-LABEL: name: ds_write_b32__physical_av32
     ; CHECK: liveins: $vgpr0, $vgpr1, $vgpr2
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:vgpr_32 = COPY $vgpr2
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:vgpr_32 = COPY $vgpr1
-    ; CHECK-NEXT: DS_WRITE2_B32_gfx9 [[COPY]], [[COPY2]], [[COPY1]], 10, 24, 0, implicit $exec :: (store (s32), addrspace 3)
-  %0:vgpr_32 = COPY $vgpr0
-  %2:av_32 = COPY $vgpr2
-  DS_WRITE_B32_gfx9 %0, $vgpr1, 40, 0, implicit $exec :: (store (s32), addrspace 3)
-  DS_WRITE_B32_gfx9 %0, %2, 96, 0, implicit $exec :: (store (s32), addrspace 3)
-...
-
----
-name:            ds_write_b64__physical_av64
-body:             |
-  bb.0:
-  liveins: $vgpr0, $vgpr2_vgpr3, $vgpr4_vgpr5
+    ; CHECK-NEXT:   %0:vgpr_32 = COPY $vgpr0
+    ; CHECK-NEXT:   %1:av_32 = COPY $vgpr2
+    ; CHECK-NEXT:   DS_WRITE_B32_gfx9 %0, $vgpr1, 40, 0, implicit $exec :: (store (s32), addrspace 3)
+    ; CHECK-NEXT:   DS_WRITE_B32_gfx9 %0, %1, 96, 0, implicit $exec :: (store (s32), addrspace 3)
 
-    ; CHECK-LABEL: name: ds_write_b64__physical_av64
-    ; CHECK: liveins: $vgpr0, $vgpr2_vgpr3, $vgpr4_vgpr5
-    ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:vreg_64_align2 = COPY $vgpr2_vgpr3
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:vreg_64_align2 = COPY $vgpr4_vgpr5
-    ; CHECK-NEXT: DS_WRITE2_B64_gfx9 [[COPY]], [[COPY1]], [[COPY2]], 5, 12, 0, implicit $exec :: (store (s64), addrspace 3)
   %0:vgpr_32 = COPY $vgpr0
-  %1:av_64_align2 = COPY $vgpr2_vgpr3
-  DS_WRITE_B64_gfx9 %0, %1, 40, 0, implicit $exec :: (store (s64), addrspace 3)
-  DS_WRITE_B64_gfx9 %0, $vgpr4_vgpr5, 96, 0, implicit $exec :: (store (s64), addrspace 3)
-...
-
-
+  %1:av_32 = COPY $vgpr2
+  DS_WRITE_B32_gfx9 %0, $vgpr1, 40, 0, implicit $exec :: (store (s32), addrspace 3)
+  DS_WRITE_B32_gfx9 %0, %1, 96, 0, implicit $exec :: (store (s32), addrspace 3)
 ...
-
----
-name:            ds_write_b64__av64__physical
-body:             |
-  bb.0:
-  liveins: $vgpr0, $vgpr2_vgpr3, $vgpr4_vgpr5
-
-    ; CHECK-LABEL: name: ds_write_b64__av64__physical
-    ; CHECK: liveins: $vgpr0, $vgpr2_vgpr3, $vgpr4_vgpr5
-    ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:vreg_64_align2 = COPY $vgpr4_vgpr5
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:vreg_64_align2 = COPY $vgpr2_vgpr3
-    ; CHECK-NEXT: DS_WRITE2_B64_gfx9 [[COPY]], [[COPY2]], [[COPY1]], 5, 12, 0, implicit $exec :: (store (s64), addrspace 3)
-  %0:vgpr_32 = COPY $vgpr0
-  %2:av_64_align2 = COPY $vgpr4_vgpr5
-  DS_WRITE_B64_gfx9 %0, $vgpr2_vgpr3, 40, 0, implicit $exec :: (store (s64), addrspace 3)
-  DS_WRITE_B64_gfx9 %0, %2, 96, 0, implicit $exec :: (store (s64), addrspace 3)
-  ...
-