Changes in code.

Author: pepla

IGC/Compiler/Optimizer/OpenCLPasses/LocalBuffers/InlineLocalsResolution.cpp

@@ -497,7 +497,7 @@ void InlineLocalsResolution::computeOffsetList(Module& M, llvm::MapVector<Functi
 #if LLVM_VERSION_MAJOR < 11
             offset = iSTD::Align(offset, DL.getPreferredAlignment(G));
 #else
-            offset = iSTD::Align(offset, (unsigned)DL.getPreferredAlign(G).value());
+            offset = iSTD::Align(offset, DL.getPreferredAlign(G).value());
 #endif
             // Save the offset of the current local
             // (set the high bits to be non-0 here too)

IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantAnalysis.cpp

@@ -219,7 +219,7 @@ bool ProgramScopeConstantAnalysis::runOnModule(Module& M)
 #if LLVM_VERSION_MAJOR < 11
         offset = iSTD::Align(offset, m_DL->getPreferredAlignment(globalVar));
 #else
-        offset = iSTD::Align(offset, (unsigned)m_DL->getPreferredAlign(globalVar).value());
+        offset = iSTD::Align(offset, m_DL->getPreferredAlign(globalVar).value());
 #endif
         inlineProgramScopeOffsets[globalVar] = offset;
         offset += (unsigned)(m_DL->getTypeAllocSize(globalVar->getType()->getPointerElementType()));

IGC/Compiler/tests/MemOpt/basic.ll

@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 
-; RUN: igc_opt %s -S -o - %enable-basic-aa% -igc-memopt -instcombine | FileCheck %s
+; RUN: igc_opt %s -S -o - -basicaa -igc-memopt -instcombine | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f80:128:128-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-a:64:64-f80:128:128-n8:16:32:64"
 

IGC/Compiler/tests/MemOpt/struct.ll

@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 
-; RUN: igc_opt %s -S -o - %enable-basic-aa% -igc-memopt -instcombine | FileCheck %s
+; RUN: igc_opt %s -S -o - -basicaa -igc-memopt -instcombine | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f80:128:128-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-a:64:64-f80:128:128-n8:16:32:64"
 

IGC/Compiler/tests/ResolveGAS/memcpy.ll

@@ -30,6 +30,6 @@ define internal spir_func void @func() {
   ret void
 }
 
-; CHECK: declare void @llvm.memcpy.p0i8.p0i8.i64(i8* {{(noalias )?}}nocapture writeonly, i8* {{(noalias )?}}nocapture readonly, i64, i1 immarg)
+; CHECK: declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1 immarg)
 declare void @llvm.memcpy.p4i8.p4i8.i64(i8 addrspace(4)* nocapture writeonly, i8 addrspace(4)* nocapture readonly, i64, i1 immarg)
 

IGC/Compiler/tests/lit.cfg.py

@@ -43,11 +43,3 @@
 tools = [ToolSubst('igc_opt')]
 
 llvm_config.add_tool_substitutions(tools, tool_dirs)
-
-# Add substitutions for pass configuration options to account for
-# opt CLI changes between LLVM 10 and 11.
-# FIXME: Remove once older-than-11 LLVM versions go out of use.
-if int(config.llvm_version) < 11:
-  config.substitutions.append(('%enable-basic-aa%', '-basicaa'))
-else:
-  config.substitutions.append(('%enable-basic-aa%', '--basic-aa'))

IGC/Compiler/tests/lit.site.cfg.py.in

@@ -11,7 +11,6 @@
 import sys
 
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
-config.llvm_version = "@LLVM_VERSION_MAJOR@"
 config.lit_tools_dir = "@LLVM_TOOLS_DIR@"
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.target_triple = "@TARGET_TRIPLE@"

IGC/WrapperLLVM/include/llvmWrapper/IR/DataLayout.h

@@ -26,7 +26,7 @@ namespace IGCLLVM
 #if LLVM_VERSION_MAJOR <= 10
         return DL->getPreferredAlignment(GV);
 #else
-        return (unsigned)DL->getPreferredAlign(GV).value();
+        return DL->getPreferredAlign(GV).value();
 #endif
     }