From 317bdfbb31d68b918983e5fa02886b936f68a247 Mon Sep 17 00:00:00 2001
From: David Stuttard <david.stuttard@amd.com>
Date: Thu, 16 Nov 2023 10:34:49 +0000
Subject: [PATCH] Make InferAlignment pass support conditional on LLVM version
 (#2820)

This support is quite new so we need to guard the changes with an LLVM version.

Additionally, remove the Enable option.
---
 lgc/patch/Patch.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lgc/patch/Patch.cpp b/lgc/patch/Patch.cpp
index 80ddfcf8ad..dd2831a8fd 100644
--- a/lgc/patch/Patch.cpp
+++ b/lgc/patch/Patch.cpp
@@ -86,7 +86,12 @@
 #include "llvm/Transforms/Scalar/EarlyCSE.h"
 #include "llvm/Transforms/Scalar/GVN.h"
 #include "llvm/Transforms/Scalar/IndVarSimplify.h"
+#if LLVM_MAIN_REVISION && LLVM_MAIN_REVISION < 475156
+// Old version of the code
+#else
+// New version of the code (also handles unknown version, which we treat as latest)
 #include "llvm/Transforms/Scalar/InferAlignment.h"
+#endif
 #include "llvm/Transforms/Scalar/InstSimplifyPass.h"
 #include "llvm/Transforms/Scalar/LICM.h"
 #include "llvm/Transforms/Scalar/LoopDeletion.h"
@@ -107,10 +112,6 @@
 
 using namespace llvm;
 
-namespace llvm {
-extern cl::opt<bool> EnableInferAlignmentPass;
-} // namespace llvm
-
 namespace lgc {
 
 // =====================================================================================================================
@@ -415,8 +416,12 @@ void Patch::addOptimizationPasses(lgc::PassManager &passMgr, uint32_t optLevel)
   fpm.addPass(SROAPass(SROAOptions::ModifyCFG));
   // uses UniformityAnalysis
   fpm.addPass(PatchReadFirstLane());
-  if (EnableInferAlignmentPass)
-    fpm.addPass(InferAlignmentPass());
+#if LLVM_MAIN_REVISION && LLVM_MAIN_REVISION < 475156
+  // Old version of the code
+#else
+  // New version of the code (also handles unknown version, which we treat as latest)
+  fpm.addPass(InferAlignmentPass());
+#endif
   fpm.addPass(InstCombinePass());
   passMgr.addPass(createModuleToFunctionPassAdaptor(std::move(fpm)));
   passMgr.addPass(ConstantMergePass());