[Autobackout][FunctionalRegression]Revert of change: 2361621: Support more intrinsics in SynchronizationObjectCoalescing

Add support for more load and store intrinsics to `SynchronizationObjectCoalescing`

Author: sys-igc

IGC/Compiler/Optimizer/SynchronizationObjectCoalescing.cpp

@@ -2538,9 +2538,8 @@ bool SynchronizationObjectCoalescing::IsUrbWriteOperation(const llvm::Instructio
     return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-inline llvm::Type* GetReadOperationPointerType(
-    const llvm::Instruction* pInst)
+////////////////////////////////////////////////////////////////////////
+bool SynchronizationObjectCoalescing::IsBufferReadOperation(const llvm::Instruction* pInst)
 {
     if (llvm::isa<llvm::GenIntrinsicInst>(pInst))
     {
@@ -2550,27 +2549,21 @@ inline llvm::Type* GetReadOperationPointerType(
         {
         case llvm::GenISAIntrinsic::GenISA_ldraw_indexed:
         case llvm::GenISAIntrinsic::GenISA_ldrawvector_indexed:
-        case llvm::GenISAIntrinsic::GenISA_simdBlockRead:
-        case llvm::GenISAIntrinsic::GenISA_simdBlockReadBindless:
-        case llvm::GenISAIntrinsic::GenISA_LSCLoad:
-        case llvm::GenISAIntrinsic::GenISA_LSCLoadWithSideEffects:
-        case llvm::GenISAIntrinsic::GenISA_LSCLoadBlock:
-        case llvm::GenISAIntrinsic::GenISA_LSCLoadCmask:
-            return pGenIntrinsicInst->getOperand(0)->getType();
+            return IsGlobalResource(pGenIntrinsicInst->getOperand(0)->getType());
         default:
             break;
         }
     }
     else if (llvm::isa<llvm::LoadInst>(pInst))
     {
-        return llvm::cast<llvm::LoadInst>(pInst)->getPointerOperandType();
+        return IsGlobalResource(llvm::cast<llvm::LoadInst>(pInst)->getPointerOperandType());
     }
-    return nullptr;
+
+    return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-inline llvm::Type* GetWriteOperationPointerType(
-    const llvm::Instruction* pInst)
+////////////////////////////////////////////////////////////////////////
+bool SynchronizationObjectCoalescing::IsBufferWriteOperation(const llvm::Instruction* pInst)
 {
     if (llvm::isa<llvm::GenIntrinsicInst>(pInst))
     {
@@ -2580,61 +2573,38 @@ inline llvm::Type* GetWriteOperationPointerType(
         {
         case llvm::GenISAIntrinsic::GenISA_storeraw_indexed:
         case llvm::GenISAIntrinsic::GenISA_storerawvector_indexed:
-        case llvm::GenISAIntrinsic::GenISA_simdBlockWrite:
-        case llvm::GenISAIntrinsic::GenISA_simdBlockWriteBindless:
-        case llvm::GenISAIntrinsic::GenISA_LSCStore:
-        case llvm::GenISAIntrinsic::GenISA_LSCStoreBlock:
-        case llvm::GenISAIntrinsic::GenISA_LSCStoreCmask:
-            return pGenIntrinsicInst->getOperand(0)->getType();
+            return IsGlobalResource(pGenIntrinsicInst->getOperand(0)->getType());
         default:
             break;
         }
     }
     else if (llvm::isa<llvm::StoreInst>(pInst))
     {
-        return llvm::cast<llvm::StoreInst>(pInst)->getPointerOperandType();
+        return IsGlobalResource(llvm::cast<llvm::StoreInst>(pInst)->getPointerOperandType());
     }
 
-    return nullptr;
-}
-
-////////////////////////////////////////////////////////////////////////
-bool SynchronizationObjectCoalescing::IsBufferReadOperation(const llvm::Instruction* pInst)
-{
-    if (llvm::Type* pPtrType = GetReadOperationPointerType(pInst))
-    {
-        return IsGlobalResource(pPtrType);
-    }
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////
-bool SynchronizationObjectCoalescing::IsBufferWriteOperation(const llvm::Instruction* pInst)
-{
-    if (llvm::Type* pPtrType = GetWriteOperationPointerType(pInst))
-    {
-        return IsGlobalResource(pPtrType);
-    }
     return false;
 }
 
 ////////////////////////////////////////////////////////////////////////
 bool SynchronizationObjectCoalescing::IsSharedMemoryReadOperation(const llvm::Instruction* pInst)
 {
-    if (llvm::Type* pPtrType = GetReadOperationPointerType(pInst))
+    if (llvm::isa<llvm::LoadInst>(pInst))
     {
-        return IsSharedMemoryResource(pPtrType);
+        return IsSharedMemoryResource(llvm::cast<llvm::LoadInst>(pInst)->getPointerOperandType());
     }
+
     return false;
 }
 
 ////////////////////////////////////////////////////////////////////////
 bool SynchronizationObjectCoalescing::IsSharedMemoryWriteOperation(const llvm::Instruction* pInst)
 {
-    if (llvm::Type* pPtrType = GetWriteOperationPointerType(pInst))
+    if (llvm::isa<llvm::StoreInst>(pInst))
     {
-        return IsSharedMemoryResource(pPtrType);
+        return IsSharedMemoryResource(llvm::cast<llvm::StoreInst>(pInst)->getPointerOperandType());
     }
+
     return false;
 }