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

Merge pull request #597 from pgurd/master

Browse Source 
- Add Silvermont (--cpu=slm) option for llvm 3.4+.
This commit is contained in:
jbrodman
2013-09-20 14:08:35 -07:00
parent 0647c02561 4b26b8b430
commit 1913199a45
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ispc.cpp
View File

@@ -126,7 +126,7 @@ lGetSystemISA() {
return "avx1.1-i32x8"; return "avx1.1-i32x8";
} }
// Regular AVX // Regular AVX
return "avx-i32x8"; return "avx1-i32x8";
} }
else if ((info[2] & (1 << 19)) != 0) else if ((info[2] & (1 << 19)) != 0)
return "sse4-i32x4"; return "sse4-i32x4";
@@ -151,6 +151,9 @@ static const char *supportedCPUs[] = {
#if !defined(LLVM_3_1) #if !defined(LLVM_3_1)
, "core-avx-i", "core-avx2" , "core-avx-i", "core-avx2"
#endif // LLVM 3.2+ #endif // LLVM 3.2+
#if !defined(LLVM_3_1) && !defined(LLVM_3_2) && !defined(LLVM_3_3)
, "slm"
#endif // LLVM 3.4+
}; };
Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) : Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
@@ -196,9 +199,10 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
isa = "avx1.1-i32x8"; isa = "avx1.1-i32x8";
else if (!strcmp(cpu, "sandybridge") || else if (!strcmp(cpu, "sandybridge") ||
!strcmp(cpu, "corei7-avx")) !strcmp(cpu, "corei7-avx"))
isa = "avx-i32x8"; isa = "avx1-i32x8";
else if (!strcmp(cpu, "corei7") || else if (!strcmp(cpu, "corei7") ||
!strcmp(cpu, "penryn")) !strcmp(cpu, "penryn") ||
!strcmp(cpu, "slm"))
isa = "sse4-i32x4"; isa = "sse4-i32x4";
else else
isa = "sse2-i32x4"; isa = "sse2-i32x4";
@@ -660,6 +664,7 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
// Initialize target-specific "target-feature" attribute. // Initialize target-specific "target-feature" attribute.
if (!m_attributes.empty()) { if (!m_attributes.empty()) {
llvm::AttrBuilder attrBuilder; llvm::AttrBuilder attrBuilder;
attrBuilder.addAttribute("target-cpu", this->m_cpu);
attrBuilder.addAttribute("target-features", this->m_attributes); attrBuilder.addAttribute("target-features", this->m_attributes);
this->m_tf_attributes = new llvm::AttributeSet( this->m_tf_attributes = new llvm::AttributeSet(
llvm::AttributeSet::get( llvm::AttributeSet::get(