RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-16 08:29:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[X86] Promote athlon, athlon-xp, k8, and k8-sse3 to types instead of subtypes in getHostCPUName. NFCI

Browse Source 
This removes the athlon type and simplifies the string decoding. We only really need these type/subtype breaks where we need to match libgcc/compiler-rt and these CPUs aren't part of that.

I'm looking into moving some of this information to a .def file to share with clang's __builtin_cpu_is handling. And while these CPUs aren't part of that the less lines I have to deal with in the .def file the better.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@317354 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2017-11-03 19:37:41 +00:00
parent c86c85f907
commit b24883f402
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Support/Host.cpp
View File

@ -355,7 +355,10 @@ enum ProcessorTypes {
INTEL_PRESCOTT,
AMD_i486,
AMDPENTIUM,
AMDATHLON,
AMD_ATHLON,
AMD_ATHLON_XP,
AMD_K8,
AMD_K8SSE3,
INTEL_GOLDMONT,
CPU_TYPE_MAX
};
@ -384,10 +387,6 @@ enum ProcessorSubtypes {
AMDPENTIUM_K62,
AMDPENTIUM_K63,
AMDPENTIUM_GEODE,
AMDATHLON_CLASSIC,
AMDATHLON_XP,
AMDATHLON_K8,
AMDATHLON_K8SSE3,
CPU_SUBTYPE_MAX
};
@ -864,20 +863,18 @@ static void getAMDProcessorTypeAndSubtype(unsigned Family, unsigned Model,
}
break;
case 6:
*Type = AMDATHLON;
if (Features & (1 << FEATURE_SSE)) {
*Subtype = AMDATHLON_XP;
*Type = AMD_ATHLON_XP;
break; // "athlon-xp"
}
*Subtype = AMDATHLON_CLASSIC;
*Type = AMD_ATHLON;
break; // "athlon"
case 15:
*Type = AMDATHLON;
if (Features & (1 << FEATURE_SSE3)) {
*Subtype = AMDATHLON_K8SSE3;
*Type = AMD_K8SSE3;
break; // "k8-sse3"
}
*Subtype = AMDATHLON_K8;
*Type = AMD_K8;
break; // "k8"
case 16:
*Type = AMDFAM10H; // "amdfam10"
@ -1149,19 +1146,14 @@ StringRef sys::getHostCPUName() {
default:
return "pentium";
}
case AMDATHLON:
switch (Subtype) {
case AMDATHLON_CLASSIC:
return "athlon";
case AMDATHLON_XP:
return "athlon-xp";
case AMDATHLON_K8:
return "k8";
case AMDATHLON_K8SSE3:
return "k8-sse3";
default:
llvm_unreachable("Unexpected subtype!");
}
case AMD_ATHLON:
return "athlon";
case AMD_ATHLON_XP:
return "athlon-xp";
case AMD_K8:
return "k8";
case AMD_K8SSE3:
return "k8-sse3";
case AMDFAM10H:
return "amdfam10";
case AMD_BTVER1: