EnzymeAD · wsmoses · Oct 15, 2019 · Oct 10, 2019 · Oct 10, 2019 · Oct 12, 2019
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -1,4 +1,4 @@
-name: Enzyme CI
+name: C/C++ CI
 
 on: [push]
 
@@ -10,13 +10,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        llvm: ["7", "8"]
+        llvm: ["7"]
         build: ["Release", "Debug"] # "RelWithDebInfo"
         os: [ubuntu-18.04]
 
     steps:
     - name: add llvm 
-      run: sudo apt-get install -y llvm-${{ matrix.llvm }}-dev llvm-${{ matrix.llvm }}-tools
+      run: sudo apt-get install -y llvm-${{ matrix.llvm }}-dev llvm-${{ matrix.llvm }}-tools clang-${{ matrix.llvm }}
     - uses: actions/checkout@v1
       with:
           fetch-depth: 1
@@ -28,5 +28,5 @@ jobs:
           cmake .. -DLLVM_EXTERNAL_LIT=/usr/lib/llvm-${{ matrix.llvm }}/build/utils/lit/lit.py -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DLLVM_DIR=/usr/lib/llvm-${{ matrix.llvm }}/lib/cmake/llvm
     - name: make
       run: cd enzyme/build && make
-    - name: make check-enzyme
-      run: cd enzyme/build && make check-enzyme
+    - name: make check-enzyme-c
+      run: cd enzyme/build && make check-enzyme-c
diff --git a/.github/workflows/functional_tests.yml → .github/workflows/enzyme.yml b/.github/workflows/functional_tests.yml → .github/workflows/enzyme.yml
@@ -1,4 +1,4 @@
-name: Functional Tests CI
+name: Enzyme CI
 
 on: [push]
 
@@ -10,13 +10,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        llvm: ["7"]
+        llvm: ["7", "8"]
         build: ["Release", "Debug"] # "RelWithDebInfo"
         os: [ubuntu-18.04]
 
     steps:
     - name: add llvm 
-      run: sudo apt-get install -y llvm-${{ matrix.llvm }}-dev llvm-${{ matrix.llvm }}-tools clang-${{ matrix.llvm }}
+      run: sudo apt-get install -y llvm-${{ matrix.llvm }}-dev llvm-${{ matrix.llvm }}-tools
     - uses: actions/checkout@v1
       with:
           fetch-depth: 1
@@ -28,5 +28,5 @@ jobs:
           cmake .. -DLLVM_EXTERNAL_LIT=/usr/lib/llvm-${{ matrix.llvm }}/build/utils/lit/lit.py -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DLLVM_DIR=/usr/lib/llvm-${{ matrix.llvm }}/lib/cmake/llvm
     - name: make
       run: cd enzyme/build && make
-    - name: make check-enzyme-c
-      run: cd enzyme/build && make check-enzyme-c
+    - name: make check-enzyme
+      run: cd enzyme/build && make check-enzyme
diff --git a/.github/workflows/julia.yml b/.github/workflows/julia.yml
@@ -44,6 +44,8 @@ jobs:
         run: |
           mkdir build
           cd build
+          cmake --version
+          ls /home/runner/work/Enzyme/Enzyme/enzyme/Enzyme/
           cmake -DLLVM_DIR=../contrib/usr/lib/cmake/llvm -DLLVM_EXTERNAL_LIT=../contrib/usr/tools/lit/lit.py ../enzyme
           make -j
       - name: "Julia tests"

diff --git a/enzyme/Enzyme/ActiveVariable.cpp b/enzyme/Enzyme/ActiveVariable.cpp
@@ -27,6 +27,7 @@
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Value.h"
 
+#include "llvm/Support/raw_ostream.h"
 
 #include "ActiveVariable.h"
 #include "Utils.h"
@@ -57,7 +58,6 @@ bool isIntASecretFloat(Value* val) {
         std::function<void(Value*)> trackPointer = [&](Value* v) {
             if (seen.find(v) != seen.end()) return;
             seen.insert(v);
-            llvm::errs() << " consider val " << *val << " for v " << * v << "\n";
                 do { 
                     Type* let = cast<PointerType>(v->getType())->getElementType();
                     if (let->isFloatingPointTy()) {
@@ -179,7 +179,6 @@ Type* isIntPointerASecretFloat(Value* val) {
         std::function<void(Value*)> trackPointer = [&](Value* v) {
             if (seen.find(v) != seen.end()) return;
             seen.insert(v);
-            llvm::errs() << " consider val " << *val << " for v " << * v << "\n";
                 do { 
                     Type* let = cast<PointerType>(v->getType())->getElementType();
                     if (let->isFloatingPointTy()) {
@@ -475,15 +474,19 @@ bool isconstantM(Instruction* inst, SmallPtrSetImpl<Value*> &constants, SmallPtr
                     return false;
                 }
             }
-
-            constants.insert(inst);
-            constants.insert(constants2.begin(), constants2.end());
-            constants.insert(constants_tmp.begin(), constants_tmp.end());
-            //if (directions == 3)
-            //  nonconstant.insert(nonconstant2.begin(), nonconstant2.end());
-            if (printconst)
-              llvm::errs() << "constant(" << (int)directions << ")  call:" << *inst << "\n";
-            return true;
+
+            //! TODO: Really need an attribute that determines whether a function can access a global (not even necessarily read)
+            //if (ci->hasFnAttr(Attribute::ReadNone) || ci->hasFnAttr(Attribute::ArgMemOnly)) 
+            {
+                constants.insert(inst);
+                constants.insert(constants2.begin(), constants2.end());
+                constants.insert(constants_tmp.begin(), constants_tmp.end());
+                //if (directions == 3)
+                //  nonconstant.insert(nonconstant2.begin(), nonconstant2.end());
+                if (printconst)
+                  llvm::errs() << "constant(" << (int)directions << ")  call:" << *inst << "\n";
+                return true;
+            }
         } else {
             for(auto& a: inst->operands()) {
                 if (!isconstantValueM(a, constants2, nonconstant2, retvals, originalInstructions, UP)) {

diff --git a/enzyme/Enzyme/CMakeLists.txt b/enzyme/Enzyme/CMakeLists.txt
@@ -2,12 +2,14 @@
 #  set(LLVM_LINK_COMPONENTS Core Support)
 #endif()
 
-file(GLOB ENZYME_SRC
+file(GLOB ENZYME_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     "*.cpp"
 )
 
 list(APPEND ENZYME_SRC SCEV/ScalarEvolutionExpander.cpp)
 
+message("found enzyme sources " ${ENZYME_SRC})
+
 if (${LLVM_VERSION_MAJOR} LESS 8)
     add_llvm_loadable_module( LLVMEnzyme-${LLVM_VERSION_MAJOR}
         ${ENZYME_SRC}

diff --git a/enzyme/Enzyme/Enzyme.cpp b/enzyme/Enzyme/Enzyme.cpp
@@ -33,7 +33,6 @@
 
 #include "llvm/Support/Debug.h"
 #include "llvm/Transforms/Scalar.h"
-#include "llvm/Transforms/Utils.h"
 
 #include "llvm/Analysis/GlobalsModRef.h"
 #include "llvm/Analysis/ScalarEvolution.h"
@@ -222,7 +221,6 @@ class Enzyme : public FunctionPass {
     AU.addRequired<TargetLibraryInfoWrapperPass>();
     AU.addRequired<AAResultsWrapperPass>();
     AU.addRequired<GlobalsAAWrapperPass>();
-    AU.addRequiredID(LoopSimplifyID);
     //AU.addRequiredID(LCSSAID);
 
     AU.addRequired<LoopInfoWrapperPass>();