Merge pull request #66 from illuhad/llvm-6.0

Initial support for LLVM > 4.0
hughperkins · Jul 3, 2018 · c63edf9 · c63edf9
2 parents 282f642 + 532a7a8
commit c63edf9
Show file tree

Hide file tree

Showing 14 changed files with 144 additions and 45 deletions.
diff --git a/include/cocl/llvm_dump.h b/include/cocl/llvm_dump.h
@@ -0,0 +1,29 @@
+// Copyright Hugh Perkins 2016, 2017
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// \author Aksel Alpay
+
+#ifndef COCL_LLVM_DUMP_H
+#define COCL_LLVM_DUMP_H
+
+#include <llvm/Support/Debug.h>
+
+#if LLVM_VERSION_MAJOR > 4
+#define COCL_LLVM_DUMP(entity) (entity)->print(llvm::dbgs(), true)
+#else
+#define COCL_LLVM_DUMP(entity) ((entity)->dump())
+#endif
+
+#endif
+
diff --git a/include/cocl/new_instruction_dumper.h b/include/cocl/new_instruction_dumper.h
@@ -17,7 +17,7 @@
 #include "cocl/LocalValueInfo.h"
 #include "cocl/InstructionDumper.h"
 #include "cocl/shims.h"
-
+#include "cocl/llvm_dump.h"
 #include <string>
 #include <stdexcept>
 
@@ -29,7 +29,7 @@ class NeedValueDependencyException : public std::exception {
     }
     virtual const char* what() const throw()
     {
-        value->dump();
+        COCL_LLVM_DUMP(value);
         return "Need dependent value";
     }
     llvm::Value *value;

diff --git a/include/cocl/patch_hostside.h b/include/cocl/patch_hostside.h
@@ -58,6 +58,8 @@ Ok, so the doc is mostly below, inside the class declaration, at the bottom of t
 #include <vector>
 #include <memory>
 
+#include "cocl/llvm_dump.h"
+
 #include "llvm/IR/Module.h"
 // #include "llvm/IR/Verifier.h"
 #include "llvm/IR/Type.h"
@@ -148,7 +150,7 @@ class GenericCallInst_Call : public GenericCallInst {
     virtual llvm::Value *getOperand(int idx) override { return inst->getArgOperand(idx); }
     virtual llvm::Module *getModule() override { return inst->getModule(); }
     virtual llvm::Instruction *getInst() override { return inst; }
-    virtual void dump() override { inst->dump(); }
+    virtual void dump() override { COCL_LLVM_DUMP(inst); }
 };
 
 class GenericCallInst_Invoke : public GenericCallInst {
@@ -159,7 +161,7 @@ class GenericCallInst_Invoke : public GenericCallInst {
     virtual llvm::Value *getOperand(int idx) override { return inst->getArgOperand(idx); }
     virtual llvm::Module *getModule() override { return inst->getModule(); }
     virtual llvm::Instruction *getInst() override { return inst; }
-    virtual void dump() override { inst->dump(); }
+    virtual void dump() override { COCL_LLVM_DUMP(inst); }
 };
 
 class PatchHostside {

diff --git a/src/ClWriter.cpp b/src/ClWriter.cpp
@@ -24,6 +24,8 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Constants.h"
 
+#include "cocl/llvm_dump.h"
+
 #include <iostream>
 using namespace std;
 using namespace llvm;
@@ -74,7 +76,7 @@ void ClWriter::writeInlineCl(std::string indent, std::ostream &os) { // writes a
     }
     if(localValueInfo->toBeDeclared) {
         if(!localValueInfo->expressionValid) {
-            localValueInfo->value->dump();
+            COCL_LLVM_DUMP(localValueInfo->value);
             cout << "expression for " << localValueInfo->name + " not defined" << endl;
             throw runtime_error("expression for " + localValueInfo->name + " not defined");
         }
@@ -156,7 +158,7 @@ void AllocaClWriter::writeDeclaration(std::string indent, TypeDumper *typeDumper
             throw runtime_error("not implemented: alloca for count != 1");
         }
     } else {
-        alloca->dump();
+        COCL_LLVM_DUMP(alloca);
         throw runtime_error("dumpalloca not implemented for non pointer type");
     }
 }
@@ -244,7 +246,7 @@ void SharedClWriter::writeDeclaration(std::string indent, TypeDumper *typeDumper
             // primitiveType->dump();
         } else {
             cout << "ERROR: sharedclwriter::writedlecaraiotn, not implemneted for:" << endl;
-            value->dump();
+            COCL_LLVM_DUMP(value);
             cout << endl;
             // TODO: uncomment this line FIXME
             return;
@@ -256,7 +258,7 @@ void SharedClWriter::writeDeclaration(std::string indent, TypeDumper *typeDumper
         os << indent << "local " << typeDumper->dumpType(primitiveType) << " " << localValueInfo->name << "[" << numElements << "];\n";
     } else {
         cout << "sharedclwriter writedeclaration not implmeneted for htis type:" << endl;
-        value->dump();
+        COCL_LLVM_DUMP(value);
         cout << endl;
         throw runtime_error("not implemented: sharedclwriter for this type");
     }
@@ -311,7 +313,7 @@ void CallClWriter::writeInlineCl(std::string indent, std::ostream &os) { // writ
     }
     if(localValueInfo->toBeDeclared) {
         if(!localValueInfo->expressionValid) {
-            localValueInfo->value->dump();
+            COCL_LLVM_DUMP(localValueInfo->value);
             cout << "expression for " << localValueInfo->name + " not defined" << endl;
             throw runtime_error("expression for " + localValueInfo->name + " not defined");
         }

diff --git a/src/GlobalNames.cpp b/src/GlobalNames.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "cocl/GlobalNames.h"
+#include "cocl/llvm_dump.h"
 
 #include "EasyCL/util/easycl_stringhelper.h"
 
@@ -35,7 +36,7 @@ std::string GlobalNames::getName(Value *value) {
     auto it = nameByValue.find(value);
     if(it == nameByValue.end()) {
         cout << "this value not found in global name map:" << endl;
-        value->dump();
+        COCL_LLVM_DUMP(value);
         cout << endl;
         throw runtime_error("value not found in global name map");
     }
@@ -99,7 +100,7 @@ std::string GlobalNames::createName(Value *value, std::string name) {
 std::string GlobalNames::getName(Type *type) {
     auto it = nameByType.find(type);
     if(it == nameByType.end()) {
-        type->dump();
+        COCL_LLVM_DUMP(type);
         cout << endl;
         throw runtime_error("type not found in name map");
     }

diff --git a/src/LocalNames.cpp b/src/LocalNames.cpp
@@ -1,4 +1,5 @@
 #include "cocl/LocalNames.h"
+#include "cocl/llvm_dump.h"
 
 #include "EasyCL/util/easycl_stringhelper.h"
 
@@ -14,7 +15,7 @@ std::string LocalNames::getName(Value *value) {
     auto it = nameByValue.find(value);
     if(it == nameByValue.end()) {
         cout << "this value not found in local names:" << endl;
-        value->dump();
+        COCL_LLVM_DUMP(value);
         cout << endl;
         throw runtime_error("value not found in local name map");
     }
@@ -67,7 +68,7 @@ bool LocalNames::hasValue(llvm::Value *value) {
 
 std::string LocalNames::createName(Value *value, std::string name) {
     if(valueByName.find(name) != valueByName.end()) {
-        valueByName[name]->dump();
+        COCL_LLVM_DUMP(valueByName[name]);
         cout << endl;
         throw runtime_error("duplicate name " + name);
     }

diff --git a/src/basicblockdumper.cpp b/src/basicblockdumper.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "cocl/basicblockdumper.h"
+#include "cocl/llvm_dump.h"
 
 #include <iostream>
 #include <stdexcept>
@@ -98,7 +99,7 @@ bool BasicBlockDumper::runGeneration(const std::map<llvm::Function *, llvm::Type
             }
         } catch(runtime_error &e) {
             cout << "basicblockdumper.runGeneration got exception whilst processing:" << endl;
-            inst->dump();
+            COCL_LLVM_DUMP(inst);
             cout << endl;
             throw e;
         }

diff --git a/src/function_dumper.cpp b/src/function_dumper.cpp
@@ -22,6 +22,8 @@
 
 #include "llvm/IR/Function.h"
 
+#include "cocl/llvm_dump.h"
+
 #include <sstream>
 
 using namespace std;
@@ -349,7 +351,7 @@ std::string FunctionDumper::dumpTerminator(Type **pReturnType, Instruction *term
         terminatorCl = dumpBranch(branch);
     } else {
         cout << "unhandled terminator type:";
-        terminator->dump();
+        COCL_LLVM_DUMP(terminator);
         throw runtime_error("unhandled terminator type");
     }
     return terminatorCl;

diff --git a/src/new_instruction_dumper.cpp b/src/new_instruction_dumper.cpp
@@ -25,6 +25,8 @@
 #include "cocl/readIR.h"
 #include "EasyCL/util/easycl_stringhelper.h"
 
+#include "cocl/llvm_dump.h"
+
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/Transforms/Utils/Cloning.h"
@@ -125,7 +127,7 @@ LocalValueInfo *NewInstructionDumper::dumpConstant(llvm::Constant *constant) {
         return constantInfo;
     } else {
         cout << "dumpconstant, unhandled valuetype valueTy " << valueTy << endl;
-        constant->dump();
+        COCL_LLVM_DUMP(constant);
         cout << endl;
         throw runtime_error("unknown constnat type");
     }
@@ -475,7 +477,7 @@ void NewInstructionDumper::dumpGetElementPtr(cocl::LocalValueInfo *localValueInf
             }
         } else {
             cout << "type unimplemeneted in gep:" << endl;
-            currentType->dump();
+            COCL_LLVM_DUMP(currentType);
             cout << endl;
             cout << "isa pointer " << isa<PointerType>(currentType) << endl;
             cout << "isa struct " << isa<StructType>(currentType) << endl;
@@ -620,7 +622,7 @@ void NewInstructionDumper::dumpExtractValue(cocl::LocalValueInfo *localValueInfo
             }
         } else {
             cout << "NewInstructionDumper::dumpExtractValue unimplemented type" << endl;
-            currentType->dump();
+            COCL_LLVM_DUMP(currentType);
             throw runtime_error("type not implemented in extractvalue");
         }
         currentType = newType;
@@ -682,7 +684,7 @@ void NewInstructionDumper::dumpInsertValue(cocl::LocalValueInfo *localValueInfo)
                 newType = elementType;
             }
         } else {
-            currentType->dump();
+            COCL_LLVM_DUMP(currentType);
             throw runtime_error("type not implemented in insertvalue");
         }
         currentType = newType;