aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed function mangling to be compatible with NVVM in CUDA7

Browse Source
This commit is contained in:
evghenii
2015-01-27 07:02:12 +01:00
parent f291d90271
commit d4a77e1b44
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -75,7 +75,7 @@ ARM_ENABLED=0
# Disable NVPTX by request # Disable NVPTX by request
# To enable: make NVPTX_ENABLED=1 # To enable: make NVPTX_ENABLED=1
NVPTX_ENABLED=0 NVPTX_ENABLED=1
# Add llvm bin to the path so any scripts run will go to the right llvm-config # Add llvm bin to the path so any scripts run will go to the right llvm-config
LLVM_BIN= $(shell $(LLVM_CONFIG) --bindir) LLVM_BIN= $(shell $(LLVM_CONFIG) --bindir)

12
type.cpp
View File

@@ -759,7 +759,8 @@ EnumType::Mangle() const {
std::string ret; std::string ret;
if (isConst) ret += "C"; if (isConst) ret += "C";
ret += variability.MangleString(); ret += variability.MangleString();
ret += std::string("enum[") + name + std::string("]"); // ret += std::string("enum[") + name + std::string("]");
ret += std::string("enum_5B_") + name + std::string("_5D_");
return ret; return ret;
} }
@@ -1448,7 +1449,8 @@ ArrayType::Mangle() const {
sprintf(buf, "%d", numElements); sprintf(buf, "%d", numElements);
else else
buf[0] = '\0'; buf[0] = '\0';
return s + "[" + buf + "]"; // return s + "[" + buf + "]";
return s + "_5B_" + buf + "_5D_";
} }
@@ -2123,12 +2125,14 @@ lMangleStruct(Variability variability, bool isConst, const std::string &name) {
Assert(variability != Variability::Unbound); Assert(variability != Variability::Unbound);
std::string ret; std::string ret;
ret += "s["; // ret += "s[";
ret += "s_5B_";
if (isConst) if (isConst)
ret += "_c_"; ret += "_c_";
ret += variability.MangleString(); ret += variability.MangleString();
ret += name + std::string("]"); // ret += name + std::string("]");
ret += name + std::string("_5D_");
return ret; return ret;
} }