[LLVM16] Improve AA result queries for RT address space analysis

Address LLVM 16 API compatibility issues related to
`RayTracingAddressSpaceAliasAnalysis`:
- Improve `AAQueryInfo` wrapper by moving to the arg-less signature based on
  LLVM 14+ `SimpleAAQueryInfo`. Use that in `StackIDScheduling` to avoid
  explicit creation of argument objects per unstable API signatures.
- Additionally, rename the `addAddressSpaceAAResult()` helper to underline the
  gathering of general & RT specific AA results
- Clean up the pass pipeline configuration by utilizing `IGCExternalAAWrapper`
  (unused as of yet) instead of direct references to the emerged
  `addJointAddressSpaceAAResults()` callback.

Author: Artem Gindinson

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -475,7 +475,7 @@ void AddLegalizationPasses(CodeGenContext& ctx, IGCPassManager& mpm, PSSignature
             mpm.add(createRayTracingAddressSpaceAAWrapperPass());
     }
 
-    mpm.add(createExternalAAWrapperPass(&addAddressSpaceAAResult));
+    mpm.add(createIGCExternalAAWrapper());
     mpm.add(createScopedNoAliasAAWrapperPass());
 
     TODO("remove the following once all IGC passes are registered to PassRegistery in their constructor")
@@ -1386,7 +1386,7 @@ void OptimizeIR(CodeGenContext* const pContext)
                 mpm.add(createRayTracingAddressSpaceAAWrapperPass());
         }
 
-        mpm.add(createExternalAAWrapperPass(&addAddressSpaceAAResult));
+        mpm.add(createIGCExternalAAWrapper());
         mpm.add(createScopedNoAliasAAWrapperPass());
 
         if (pContext->m_instrTypes.hasLoadStore)

IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.cpp

@@ -213,11 +213,10 @@ ImmutablePass* IGC::createAddressSpaceAAWrapperPass() {
     return new AddressSpaceAAWrapperPass();
 }
 
-void IGC::addAddressSpaceAAResult(Pass& P, Function&, AAResults& AAR) {
+void IGC::addJointAddressSpaceAAResults(Pass& P, Function& F, AAResults& AAR) {
     if (auto * WrapperPass = P.getAnalysisIfAvailable<AddressSpaceAAWrapperPass>())
         AAR.addAAResult(WrapperPass->getResult());
-    if (auto * WrapperPass = P.getAnalysisIfAvailable<RayTracingAddressSpaceAAWrapperPass>())
-        AAR.addAAResult(WrapperPass->getResult());
+    addRayTracingAddressSpaceAAResult(P, F, AAR);
 }
 
 // Wrapper around LLVM's ExternalAAWrapperPass so that the default constructor
@@ -226,9 +225,13 @@ class IGCExternalAAWrapper : public ExternalAAWrapperPass {
 public:
   static char ID;
 
-  IGCExternalAAWrapper() : ExternalAAWrapperPass(&addAddressSpaceAAResult) {}
+  IGCExternalAAWrapper() : ExternalAAWrapperPass(&addJointAddressSpaceAAResults) {}
 };
 
+ImmutablePass* IGC::createIGCExternalAAWrapper() {
+    return new IGCExternalAAWrapper();
+}
+
 char IGCExternalAAWrapper::ID = 0;
 
 IGC_INITIALIZE_PASS_BEGIN(IGCExternalAAWrapper, "igc-aa-wrapper", "IGC Address space alias analysis Wrapper", PASS_CFG_ONLY, PASS_ANALYSIS)

IGC/Compiler/Optimizer/OpenCLPasses/AddressSpaceAliasAnalysis/AddressSpaceAliasAnalysis.h

@@ -18,7 +18,8 @@ SPDX-License-Identifier: MIT
 namespace IGC {
 
     llvm::ImmutablePass* createAddressSpaceAAWrapperPass();
-    void addAddressSpaceAAResult(llvm::Pass&, llvm::Function&, llvm::AAResults&);
+    llvm::ImmutablePass* createIGCExternalAAWrapper();
+    void addJointAddressSpaceAAResults(llvm::Pass&, llvm::Function&, llvm::AAResults&);
 
 } // End IGC namespace
 

IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h

@@ -19,13 +19,13 @@ namespace IGCLLVM
 #else
   using AliasResultEnum = llvm::AliasResult::Kind;
 #endif
-inline llvm::AAQueryInfo makeAAQueryInfo() {
-#if LLVM_VERSION_MAJOR >= 14
-  return llvm::AAQueryInfo(new llvm::SimpleCaptureInfo());
+
+  using SimpleAAQueryInfo =
+#if LLVM_VERSION_MAJOR < 14
+      llvm::AAQueryInfo;
 #else
-  return llvm::AAQueryInfo();
+      llvm::SimpleAAQueryInfo;
 #endif
 }
-}
 
 #endif