All benchmarks building (not optimized)

EnzymeAD · Apr 23, 2020 · 81f22f5 · 81f22f5
1 parent 0734012
commit 81f22f5
Show file tree

Hide file tree

Showing 14 changed files with 222 additions and 182 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -14,7 +14,7 @@ jobs:
         build: ["Release", "Debug"] # "RelWithDebInfo"
         os: [self-hosted]
 
-    timeout-minutes: 30 
+    timeout-minutes: 45 
     steps:
     - name: add llvm 
       run: |

diff --git a/enzyme/Enzyme/EnzymeLogic.cpp b/enzyme/Enzyme/EnzymeLogic.cpp
@@ -3144,7 +3144,7 @@ badfn:;
     std::reverse(postCreate.begin(), postCreate.end());
     for(auto a : postCreate) {
       for(unsigned i=0; i<a->getNumOperands(); i++) {
-        a->setOperand(i, gutils->unwrapM(a->getOperand(i), Builder2, mapp, true));
+        a->setOperand(i, gutils->unwrapM(a->getOperand(i), Builder2, mapp, UnwrapMode::LegalFullUnwrap));
       }
       llvm::errs() << "moving instruction for postcreate: " << *a << "\n";
       a->moveBefore(*Builder2.GetInsertBlock(), Builder2.GetInsertPoint());

diff --git a/enzyme/Enzyme/GradientUtils.cpp b/enzyme/Enzyme/GradientUtils.cpp
@@ -104,14 +104,24 @@
 
 bool GradientUtils::legalRecompute(Value* val, const ValueToValueMapTy& available) {
   if (available.count(val)) return true;
-  if (isa<PHINode>(val)) return false;
+
+  if (isa<PHINode>(val)) {
+    if (auto dli = dyn_cast_or_null<LoadInst>(hasUninverted(val))) {
+      return legalRecompute(dli, available); // TODO ADD && !TR.intType(getOriginal(dli), /*mustfind*/false).isPossibleFloat();
+    }
+    return false;
+  }
 
   if (isa<Instruction>(val) && cast<Instruction>(val)->getMetadata("enzyme_mustcache")) return false;
 
+  // If this is a load from cache already, dont force a cache of this
+  if (isa<LoadInst>(val) && cast<LoadInst>(val)->getMetadata("enzyme_fromcache")) return true;
+
   //TODO consider callinst here
 
   if (auto li = dyn_cast<LoadInst>(val)) {
 
+
     //TODO this is more conservative than necessary
     //if (isa<AllocaInst>(GetUnderlyingObject(li->getPointerOperand(), oldFunc->getParent()->getDataLayout(), 100))) {
     //  return false;
@@ -935,8 +945,8 @@ Value* GradientUtils::lookupM(Value* val, IRBuilder<>& BuilderM, const ValueToVa
     //llvm::errs() << " considering " << *inst << " legal: " << legalRecompute(inst, available) << " should: " << shouldRecompute(inst, available) << "\n";
     if (legalRecompute(inst, available)) {
       if (shouldRecompute(inst, available)) {
-          //llvm::errs() << "for op " << *inst << " choosing to unwrap\n";
-          auto op = unwrapM(inst, BuilderM, available, /*lookupIfAble*/false, /*fullUnwrap*/false);
+          auto op = unwrapM(inst, BuilderM, available, UnwrapMode::AttemptSingleUnwrap);
+          //llvm::errs() << "for op " << *inst << " choosing to unwrap and found: " << op << "\n";
           if (op) {
             assert(op);
             assert(op->getType());
@@ -955,7 +965,7 @@ Value* GradientUtils::lookupM(Value* val, IRBuilder<>& BuilderM, const ValueToVa
           }
       } else {
         if (isa<LoadInst>(inst)) {
-          llvm::errs() << " + loading " << *inst << "\n";
+          //llvm::errs() << " + loading " << *inst << "\n";
         }
       }
     }