llvm-16: fixing tests, wip (#12)

* llvm-16 tests, WIP
EnzymeAD · May 21, 2023 · 5adc5af · 5adc5af
1 parent 2eedfe3
commit 5adc5af
Show file tree

Hide file tree

Showing 188 changed files with 379 additions and 196 deletions.
diff --git a/enzyme/test/Enzyme/ForwardModeSplit/Faddeeva_erf.ll b/enzyme/test/Enzyme/ForwardModeSplit/Faddeeva_erf.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,simplifycfg,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 declare { double, double } @Faddeeva_erf({ double, double }, double)
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/Faddeeva_erfc.ll b/enzyme/test/Enzyme/ForwardModeSplit/Faddeeva_erfc.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,simplifycfg,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 declare { double, double } @Faddeeva_erfc({ double, double }, double)
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/Faddeeva_erfi.ll b/enzyme/test/Enzyme/ForwardModeSplit/Faddeeva_erfi.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,simplifycfg,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 declare { double, double } @Faddeeva_erfi({ double, double }, double)
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/add.ll b/enzyme/test/Enzyme/ForwardModeSplit/add.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline nounwind readnone uwtable
 define double @tester(double %x, double %y) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/addOneMem.ll b/enzyme/test/Enzyme/ForwardModeSplit/addOneMem.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -inline -mem2reg -instsimplify -gvn -dse -dse -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -inline -mem2reg -instsimplify -gvn -dse -dse -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(inline,mem2reg,instsimplify,gvn,dse,dse)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; __attribute__((noinline))
 ; void addOneMem(double *x) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/badcall.ll b/enzyme/test/Enzyme/ForwardModeSplit/badcall.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define dso_local zeroext i1 @metasubf(double* nocapture %x) local_unnamed_addr #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/badcall2.ll b/enzyme/test/Enzyme/ForwardModeSplit/badcall2.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define dso_local zeroext i1 @metasubf(double* nocapture %x) local_unnamed_addr #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/badcall3.ll b/enzyme/test/Enzyme/ForwardModeSplit/badcall3.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define dso_local zeroext i1 @metasubf(double* nocapture %x) local_unnamed_addr #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/badcall4.ll b/enzyme/test/Enzyme/ForwardModeSplit/badcall4.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define dso_local zeroext i1 @metasubf(double* nocapture %x) local_unnamed_addr #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/badcallsq.ll b/enzyme/test/Enzyme/ForwardModeSplit/badcallsq.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define dso_local zeroext i1 @metasubf(double* nocapture %x) local_unnamed_addr #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/badcallused.ll b/enzyme/test/Enzyme/ForwardModeSplit/badcallused.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define dso_local zeroext i1 @metasubf(double* nocapture %x) local_unnamed_addr #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/badcallused2.ll b/enzyme/test/Enzyme/ForwardModeSplit/badcallused2.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define dso_local zeroext i1 @metasubf(double* nocapture %x) local_unnamed_addr #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/bitcast.ll b/enzyme/test/Enzyme/ForwardModeSplit/bitcast.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -adce -instsimplify -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -adce -instsimplify -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,simplifycfg,adce,instsimplify)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 define double @tester(double %x) {
 entry:

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/blas/cblas_ddot.ll b/enzyme/test/Enzyme/ForwardModeSplit/blas/cblas_ddot.ll
@@ -1,4 +1,5 @@
-;RUN: %opt < %s %loadEnzyme -enzyme -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+;RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+;RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -S | FileCheck %s; fi
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/bsearch.ll b/enzyme/test/Enzyme/ForwardModeSplit/bsearch.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -inline -mem2reg -gvn -instsimplify -correlated-propagation -adce -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -inline -mem2reg -gvn -instsimplify -correlated-propagation -adce -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(inline,mem2reg,gvn,instsimplify,correlated-propagation,adce,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define  double @f(double* nocapture %x, i64 %n) #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/bsearch2.ll b/enzyme/test/Enzyme/ForwardModeSplit/bsearch2.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -inline -mem2reg -gvn -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -inline -mem2reg -gvn -instsimplify -adce -correlated-propagation -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(inline,mem2reg,gvn,instsimplify,adce,correlated-propagation,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline norecurse nounwind uwtable
 define  double @f(double* nocapture %x, i64 %n) #0 {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/call.ll b/enzyme/test/Enzyme/ForwardModeSplit/call.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; extern double __enzyme_fwdsplit(double (double), double, double);
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/callmincacheunwrap.ll b/enzyme/test/Enzyme/ForwardModeSplit/callmincacheunwrap.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -loop-deletion -correlated-propagation -simplifycfg -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -adce -loop-deletion -correlated-propagation -simplifycfg -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,adce,loop-deletion,correlated-propagation,simplifycfg,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 source_filename = "/mnt/pci4/wmdata/Enzyme2/enzyme/test/Integration/ReverseMode/eigensumsqdyn.cpp"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/calloc.ll b/enzyme/test/Enzyme/ForwardModeSplit/calloc.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 
 @enzyme_dupnoneed = dso_local global i32 0, align 4

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/constant.ll b/enzyme/test/Enzyme/ForwardModeSplit/constant.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline nounwind readnone uwtable
 define double @tester(double %x) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/constselect.ll b/enzyme/test/Enzyme/ForwardModeSplit/constselect.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; ModuleID = 'inp.c'
 source_filename = "inp.c"

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/cos.ll b/enzyme/test/Enzyme/ForwardModeSplit/cos.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -O3 -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -O3 -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme" -enzyme-preopt=false -O3 -S | FileCheck %s; fi
 
 ; Function Attrs: nounwind readnone uwtable
 define double @tester(double %x) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/cosh.ll b/enzyme/test/Enzyme/ForwardModeSplit/cosh.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: nounwind readnone uwtable
 define double @tester(double %x) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/custom0.ll b/enzyme/test/Enzyme/ForwardModeSplit/custom0.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -preserve-nvvm -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse -S | FileCheck %s 
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -preserve-nvvm -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse -S | FileCheck %s ; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="preserve-nvvm,enzyme,function(mem2reg,simplifycfg,early-cse)" -enzyme-preopt=false -S | FileCheck %s ; fi
 
 source_filename = "exer2.c"
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/custom1.ll b/enzyme/test/Enzyme/ForwardModeSplit/custom1.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -preserve-nvvm -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse -S | FileCheck %s 
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -preserve-nvvm -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="preserve-nvvm,enzyme,function(mem2reg,simplifycfg,early-cse)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 source_filename = "exer2.c"
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/custom2.ll b/enzyme/test/Enzyme/ForwardModeSplit/custom2.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -preserve-nvvm -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse -S | FileCheck %s 
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -preserve-nvvm -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="preserve-nvvm,enzyme,function(mem2reg,simplifycfg,early-cse)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 source_filename = "exer2.c"
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/div.ll b/enzyme/test/Enzyme/ForwardModeSplit/div.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -early-cse -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -early-cse -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,early-cse,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline nounwind readnone uwtable
 define double @tester(double %x, double %y) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/divreduce.ll b/enzyme/test/Enzyme/ForwardModeSplit/divreduce.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse-memssa -instsimplify -correlated-propagation -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse-memssa -instsimplify -correlated-propagation -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,simplifycfg,early-cse-memssa,instsimplify,correlated-propagation,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: norecurse nounwind readonly uwtable
 define double @alldiv(double* nocapture readonly %A, i64 %N, double %start) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/divreduce2.ll b/enzyme/test/Enzyme/ForwardModeSplit/divreduce2.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse-memssa -instsimplify -correlated-propagation -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -simplifycfg -early-cse-memssa -instsimplify -correlated-propagation -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,simplifycfg,early-cse-memssa,instsimplify,correlated-propagation,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; TODO optimize this style reduction
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/enzyme_inactive.ll b/enzyme/test/Enzyme/ForwardModeSplit/enzyme_inactive.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline nounwind readnone uwtable
 define double @tester(double %x) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/enzyme_inactive2.ll b/enzyme/test/Enzyme/ForwardModeSplit/enzyme_inactive2.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -instsimplify -simplifycfg -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,instsimplify,simplifycfg)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 ; Function Attrs: noinline nounwind readnone uwtable
 define double @tester(double %x) {

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/erf.ll b/enzyme/test/Enzyme/ForwardModeSplit/erf.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,simplifycfg,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 declare double @erf(double)
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/erfc.ll b/enzyme/test/Enzyme/ForwardModeSplit/erfc.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,simplifycfg,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 declare double @erfc(double)
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/erfi.ll b/enzyme/test/Enzyme/ForwardModeSplit/erfi.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -mem2reg -sroa -instsimplify -simplifycfg -adce -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme,function(mem2reg,sroa,instsimplify,simplifycfg,adce)" -enzyme-preopt=false -S | FileCheck %s; fi
 
 declare double @erfi(double)
 

diff --git a/enzyme/test/Enzyme/ForwardModeSplit/exp.ll b/enzyme/test/Enzyme/ForwardModeSplit/exp.ll
@@ -1,4 +1,5 @@
-; RUN: %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -O3 -S | FileCheck %s
+; RUN: if [ %llvmver -lt 16 ]; then %opt < %s %loadEnzyme -enzyme -enzyme-preopt=false -O3 -S | FileCheck %s; fi
+; RUN: if [ %llvmver -ge 16 ]; then %opt < %s %newLoadEnzyme -passes="enzyme" -enzyme-preopt=false -O3 -S | FileCheck %s; fi
 
 ; Function Attrs: nounwind readnone uwtable
 define double @tester(double %x) {