Fix llvm main (#1399)

* Fix llvm main * Fix llvm17 * Remove udiv/sdiv operators * Fix format
EnzymeAD · Sep 2, 2023 · 116e8bb · 116e8bb
1 parent 00d84a7
commit 116e8bb
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/enzyme/Enzyme/ActivityAnalysisPrinter.cpp b/enzyme/Enzyme/ActivityAnalysisPrinter.cpp
@@ -89,7 +89,7 @@ bool printActivityAnalysis(llvm::Function &F, TargetLibraryInfo &TLI) {
     if (a.getType()->isFPOrFPVectorTy()) {
       dt = ConcreteType(a.getType()->getScalarType());
     } else if (a.getType()->isPointerTy()) {
-#if LLVM_VERSION_MAJOR >= 18
+#if LLVM_VERSION_MAJOR >= 17
 #else
       auto et = a.getType()->getPointerElementType();
       if (et->isFPOrFPVectorTy()) {
@@ -113,7 +113,7 @@ bool printActivityAnalysis(llvm::Function &F, TargetLibraryInfo &TLI) {
   if (F.getReturnType()->isFPOrFPVectorTy()) {
     dt = ConcreteType(F.getReturnType()->getScalarType());
   } else if (F.getReturnType()->isPointerTy()) {
-#if LLVM_VERSION_MAJOR >= 18
+#if LLVM_VERSION_MAJOR >= 17
 #else
     auto et = F.getReturnType()->getPointerElementType();
     if (et->isFPOrFPVectorTy()) {

diff --git a/enzyme/Enzyme/CApi.cpp b/enzyme/Enzyme/CApi.cpp
@@ -1237,7 +1237,7 @@ void EnzymeFixupJuliaCallingConvention(LLVMValueRef F_C) {
 
   for (auto idx : enzyme_srets) {
     llvm::Type *T = nullptr;
-#if LLVM_VERSION_MAJOR >= 18
+#if LLVM_VERSION_MAJOR >= 17
     llvm_unreachable("Unhandled");
     // T = F->getParamAttribute(idx, Attribute::AttrKind::ElementType)
     //        .getValueAsType();
@@ -1249,7 +1249,7 @@ void EnzymeFixupJuliaCallingConvention(LLVMValueRef F_C) {
   for (auto idx : enzyme_srets_v) {
     llvm::Type *T = nullptr;
     auto AT = cast<ArrayType>(FT->getParamType(idx));
-#if LLVM_VERSION_MAJOR >= 18
+#if LLVM_VERSION_MAJOR >= 17
     llvm_unreachable("Unhandled");
     // T = F->getParamAttribute(idx, Attribute::AttrKind::ElementType)
     //         .getValueAsType();
@@ -1499,7 +1499,7 @@ void EnzymeFixupJuliaCallingConvention(LLVMValueRef F_C) {
     auto arg = delArgMap[i];
     assert(arg);
     llvm::Type *T = nullptr;
-#if LLVM_VERSION_MAJOR >= 18
+#if LLVM_VERSION_MAJOR >= 17
     llvm_unreachable("Unhandled");
     // T = F->getParamAttribute(i, Attribute::AttrKind::ElementType)
     //        .getValueAsType();
@@ -1515,7 +1515,7 @@ void EnzymeFixupJuliaCallingConvention(LLVMValueRef F_C) {
     assert(arg);
     auto AT = cast<ArrayType>(FT->getParamType(i));
     llvm::Type *T = nullptr;
-#if LLVM_VERSION_MAJOR >= 18
+#if LLVM_VERSION_MAJOR >= 17
     llvm_unreachable("Unhandled");
     // T = F->getParamAttribute(i, Attribute::AttrKind::ElementType)
     //        .getValueAsType();

diff --git a/enzyme/Enzyme/Clang/EnzymeClang.cpp b/enzyme/Enzyme/Clang/EnzymeClang.cpp
@@ -168,10 +168,15 @@ struct EnzymeFunctionLikeAttrInfo : public ParsedAttrInfo {
     // GNU-style __attribute__(("example")) and C++/C2x-style [[example]] and
     // [[plugin::example]] supported.
     static constexpr Spelling S[] = {
-        {ParsedAttr::AS_GNU, "enzyme_function_like"},
-        {ParsedAttr::AS_C2x, "enzyme_function_like"},
-        {ParsedAttr::AS_CXX11, "enzyme_function_like"},
-        {ParsedAttr::AS_CXX11, "enzyme::function_like"}};
+      {ParsedAttr::AS_GNU, "enzyme_function_like"},
+#if LLVM_VERSION_MAJOR > 17
+      {ParsedAttr::AS_C23, "enzyme_function_like"},
+#else
+      {ParsedAttr::AS_C2x, "enzyme_function_like"},
+#endif
+      {ParsedAttr::AS_CXX11, "enzyme_function_like"},
+      {ParsedAttr::AS_CXX11, "enzyme::function_like"}
+    };
     Spellings = S;
   }
 
@@ -305,10 +310,15 @@ struct EnzymeInactiveAttrInfo : public ParsedAttrInfo {
     // GNU-style __attribute__(("example")) and C++/C2x-style [[example]] and
     // [[plugin::example]] supported.
     static constexpr Spelling S[] = {
-        {ParsedAttr::AS_GNU, "enzyme_inactive"},
-        {ParsedAttr::AS_C2x, "enzyme_inactive"},
-        {ParsedAttr::AS_CXX11, "enzyme_inactive"},
-        {ParsedAttr::AS_CXX11, "enzyme::inactive"}};
+      {ParsedAttr::AS_GNU, "enzyme_inactive"},
+#if LLVM_VERSION_MAJOR > 17
+      {ParsedAttr::AS_C23, "enzyme_inactive"},
+#else
+      {ParsedAttr::AS_C2x, "enzyme_inactive"},
+#endif
+      {ParsedAttr::AS_CXX11, "enzyme_inactive"},
+      {ParsedAttr::AS_CXX11, "enzyme::inactive"}
+    };
     Spellings = S;
   }
 

diff --git a/enzyme/Enzyme/TraceUtils.cpp b/enzyme/Enzyme/TraceUtils.cpp
@@ -69,7 +69,8 @@ TraceUtils::FromClone(ProbProgMode mode,
     params.push_back(orig_FTy->getParamType(i));
   }
 
-  Type *likelihood_acc_type = PointerType::getDoublePtrTy(Context);
+  Type *likelihood_acc_type =
+      PointerType::getUnqual(Type::getDoubleTy(Context));
   params.push_back(likelihood_acc_type);
 
   if (mode == ProbProgMode::Trace || mode == ProbProgMode::Condition) {

diff --git a/enzyme/Enzyme/TypeAnalysis/TypeAnalysis.cpp b/enzyme/Enzyme/TypeAnalysis/TypeAnalysis.cpp
@@ -5202,9 +5202,11 @@ bool TypeAnalyzer::mustRemainInteger(Value *val, bool *returned) {
         continue;
     }
     if (isa<BinaryOperator>(u) || isa<IntrinsicInst>(u) || isa<PHINode>(u) ||
-        isa<UDivOperator>(u) || isa<SDivOperator>(u) || isa<LShrOperator>(u) ||
-        isa<AShrOperator>(u) || isa<AddOperator>(u) || isa<MulOperator>(u) ||
-        isa<ShlOperator>(u)) {
+#if LLVM_VERSION_MAJOR <= 17
+        isa<UDivOperator>(u) || isa<SDivOperator>(u) ||
+#endif
+        isa<LShrOperator>(u) || isa<AShrOperator>(u) || isa<AddOperator>(u) ||
+        isa<MulOperator>(u) || isa<ShlOperator>(u)) {
       if (!mustRemainInteger(u, returned)) {
         seen[val].first = false;
         seen[val].second |= seen[u].second;

diff --git a/enzyme/Enzyme/Utils.h b/enzyme/Enzyme/Utils.h
@@ -431,7 +431,7 @@ static inline DIFFE_TYPE whatType(llvm::Type *arg, DerivativeMode mode,
   }
 
   if (arg->isPointerTy()) {
-#if LLVM_VERSION_MAJOR >= 18
+#if LLVM_VERSION_MAJOR >= 17
     return DIFFE_TYPE::DUP_ARG;
 #else
 #if LLVM_VERSION_MAJOR >= 15