[LLVM16] [LITS] Fixing 38 failing LITs of LdStCombine

Porting IGC code to LLVM16

* Fixing 38 failing LITs of LdStCombine

        LdStCombine/DI_call_between_stores-typed-pointers.ll
        LdStCombine/DI_call_between_stores.ll
        LdStCombine/load_basic.ll
        LdStCombine/load_favor_vector-typed-pointers.ll
        LdStCombine/load_favor_vector.ll
        LdStCombine/load_struct_vec_member-typed-pointers.ll
        LdStCombine/load_struct_vec_member.ll
        LdStCombine/load_use_struct_1-typed-pointers.ll
        LdStCombine/load_use_struct_1.ll
        LdStCombine/load_use_struct_2-typed-pointers.ll
        LdStCombine/load_use_struct_2.ll
        LdStCombine/load_use_vector-typed-pointers.ll
        LdStCombine/load_use_vector.ll
        LdStCombine/store_address_or_inst-typed-pointers.ll
        LdStCombine/store_address_or_inst.ll
        LdStCombine/store_address_sext_inst-typed-pointers.ll
        LdStCombine/store_address_sext_inst.ll
        LdStCombine/store_check_uniform-typed-pointers.ll
        LdStCombine/store_check_uniform.ll
        LdStCombine/store_fence_split.ll
        LdStCombine/store_no_overlap_stores-typed-pointers.ll
        LdStCombine/store_no_overlap_stores.ll
        LdStCombine/store_no_vec3_member-typed-pointers.ll
        LdStCombine/store_no_vec3_member.ll
        LdStCombine/store_prefer_struct_over_vector-typed-pointers.ll
        LdStCombine/store_prefer_struct_over_vector.ll
        LdStCombine/store_two_pointers.ll
        LdStCombine/store_two_stores-typed-pointers.ll
        LdStCombine/store_two_stores.ll
        LdStCombine/store_use_struct.ll
        LdStCombine/store_use_vector-typed-pointers.ll
        LdStCombine/store_use_vector.ll
        LdStCombine/store_vec_member-typed-pointers.ll
        LdStCombine/store_vec_member.ll
        LdStCombine/store_vector_with_const-typed-pointers.ll
        LdStCombine/store_vector_with_const.ll
        LdStCombine/uniqueLayoutStruct-typed-pointers.ll
        LdStCombine/uniqueLayoutStruct.ll

Author: bokrzesi

IGC/Compiler/CISACodeGen/MemOpt.cpp

@@ -13,8 +13,6 @@ SPDX-License-Identifier: MIT
 #include <llvmWrapper/Analysis/MemoryLocation.h>
 #include <llvmWrapper/Analysis/TargetLibraryInfo.h>
 #include <llvmWrapper/Analysis/AliasSetTracker.h>
-#include <llvm/Analysis/AliasAnalysis.h>
-#include "llvm/Analysis/AliasSetTracker.h"
 #include <llvm/Analysis/InstructionSimplify.h>
 #include <llvm/Analysis/ScalarEvolution.h>
 #include <llvm/Analysis/ScalarEvolutionExpressions.h>
@@ -3297,7 +3295,8 @@ void LdStCombine::combineStores()
 
             // Keep store candidates for checking alias to see if those
             // stores can be moved to the place of the last store.
-            AliasSetTracker AST = IGCLLVM::createAliasSetTracker(m_AA);
+            auto batchAARes = IGCLLVM::AliasAnalysis::createAAresults(m_AA);
+            AliasSetTracker AST = IGCLLVM::createAliasSetTracker(batchAARes);
 
             AST.add(base);
             for (auto JI = std::next(II); JI != IE; ++JI) {
@@ -3412,7 +3411,8 @@ void LdStCombine::combineLoads()
 
             // Keep store/maywritemem/fence insts for checking alias to see if those
             // stores block load candidates from moving to the first (leading) load.
-            AliasSetTracker AST = IGCLLVM::createAliasSetTracker(m_AA);
+            auto batchAARes = IGCLLVM::AliasAnalysis::createAAresults(m_AA);
+            AliasSetTracker AST = IGCLLVM::createAliasSetTracker(batchAARes);
 
             for (auto JI = std::next(II); JI != IE; ++JI) {
                 Instruction* I = &*JI;

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

@@ -12,17 +12,32 @@ SPDX-License-Identifier: MIT
 #include "llvm/Analysis/AliasAnalysis.h"
 #include <llvm/Analysis/AliasSetTracker.h>
 
-namespace IGCLLVM
-{
-  llvm::AliasSetTracker createAliasSetTracker(llvm::AliasAnalysis *aliasAnalysis)
-  {
-#if LLVM_VERSION_MAJOR < 16
-    return llvm::AliasSetTracker(*aliasAnalysis);
-#else
-    llvm::BatchAAResults batchAAResult(*aliasAnalysis);
-    return llvm::AliasSetTracker(batchAAResult);
-#endif
-  }
+namespace IGCLLVM {
+  namespace AliasAnalysis {
+      #if LLVM_VERSION_MAJOR < 16
+        using BatchAAResults = llvm::AliasAnalysis*;
+      #else
+        using BatchAAResults = llvm::BatchAAResults;
+      #endif
+
+      BatchAAResults createAAresults(llvm::AliasAnalysis* AA)
+      {
+        #if LLVM_VERSION_MAJOR < 16
+          return AA;
+        #else
+          return llvm::BatchAAResults(*AA);
+        #endif
+      }
+    } // end namespace AliasAnalysis
+
+    llvm::AliasSetTracker createAliasSetTracker(AliasAnalysis::BatchAAResults AARes)
+    {
+      #if LLVM_VERSION_MAJOR < 16
+        return llvm::AliasSetTracker(*AARes);
+      #else
+        return llvm::AliasSetTracker(AARes);
+      #endif
+    }
 }
 
 #endif