Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions clang/lib/Basic/Targets/X86.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,15 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
case CK_Geode:
defineCPUMacros(Builder, "geode");
break;
case CK_C86_4G_M4:
defineCPUMacros(Builder, "c86_4g_m4");
break;
case CK_C86_4G_M6:
defineCPUMacros(Builder, "c86_4g_m6");
break;
case CK_C86_4G_M7:
defineCPUMacros(Builder, "c86_4g_m7");
break;
}

// Target properties.
Expand Down Expand Up @@ -1657,6 +1666,10 @@ std::optional<unsigned> X86TargetInfo::getCPUCacheLineSize() const {
case CK_ZNVER4:
case CK_ZNVER5:
case CK_ZNVER6:
// Hygon
case CK_C86_4G_M4:
case CK_C86_4G_M6:
case CK_C86_4G_M7:
// Deprecated
case CK_x86_64:
case CK_x86_64_v2:
Expand Down
3 changes: 3 additions & 0 deletions clang/test/CodeGen/target-builtin-noerror.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,7 @@ void verifycpustrings(void) {
(void)__builtin_cpu_is("znver5");
(void)__builtin_cpu_is("znver6");
(void)__builtin_cpu_is("diamondrapids");
(void)__builtin_cpu_is("c86-4g-m4");
(void)__builtin_cpu_is("c86-4g-m6");
(void)__builtin_cpu_is("c86-4g-m7");
}
12 changes: 12 additions & 0 deletions clang/test/Driver/x86-march.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,18 @@
// RUN: | FileCheck %s -check-prefix=znver6
// znver6: "-target-cpu" "znver6"

// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=c86-4g-m4 2>&1 \
// RUN: | FileCheck %s -check-prefix=c86-4g-m4
// c86-4g-m4: "-target-cpu" "c86-4g-m4"

// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=c86-4g-m6 2>&1 \
// RUN: | FileCheck %s -check-prefix=c86-4g-m6
// c86-4g-m6: "-target-cpu" "c86-4g-m6"

// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=c86-4g-m7 2>&1 \
// RUN: | FileCheck %s -check-prefix=c86-4g-m7
// c86-4g-m7: "-target-cpu" "c86-4g-m7"

// RUN: %clang -target x86_64 -c -### %s -march=x86-64 2>&1 | FileCheck %s --check-prefix=x86-64
// x86-64: "-target-cpu" "x86-64"
// RUN: %clang -target x86_64 -c -### %s -march=x86-64-v2 2>&1 | FileCheck %s --check-prefix=x86-64-v2
Expand Down
3 changes: 3 additions & 0 deletions clang/test/Frontend/x86-target-cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,8 @@
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver4 -verify %s
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver5 -verify %s
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver6 -verify %s
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu c86-4g-m4 -verify %s
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu c86-4g-m6 -verify %s
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu c86-4g-m7 -verify %s
//
// expected-no-diagnostics
12 changes: 12 additions & 0 deletions clang/test/Misc/target-invalid-cpu-note/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
// X86-SAME: {{^}}, znver4
// X86-SAME: {{^}}, znver5
// X86-SAME: {{^}}, znver6
// X86-SAME: {{^}}, c86-4g-m4
// X86-SAME: {{^}}, c86-4g-m6
// X86-SAME: {{^}}, c86-4g-m7
// X86-SAME: {{^}}, x86-64
// X86-SAME: {{^}}, x86-64-v2
// X86-SAME: {{^}}, x86-64-v3
Expand Down Expand Up @@ -185,6 +188,9 @@
// X86_64-SAME: {{^}}, znver4
// X86_64-SAME: {{^}}, znver5
// X86_64-SAME: {{^}}, znver6
// X86_64-SAME: {{^}}, c86-4g-m4
// X86_64-SAME: {{^}}, c86-4g-m6
// X86_64-SAME: {{^}}, c86-4g-m7
// X86_64-SAME: {{^}}, x86-64
// X86_64-SAME: {{^}}, x86-64-v2
// X86_64-SAME: {{^}}, x86-64-v3
Expand Down Expand Up @@ -293,6 +299,9 @@
// TUNE_X86-SAME: {{^}}, znver4
// TUNE_X86-SAME: {{^}}, znver5
// TUNE_X86-SAME: {{^}}, znver6
// TUNE_X86-SAME: {{^}}, c86-4g-m4
// TUNE_X86-SAME: {{^}}, c86-4g-m6
// TUNE_X86-SAME: {{^}}, c86-4g-m7
// TUNE_X86-SAME: {{^}}, x86-64
// TUNE_X86-SAME: {{^}}, geode
// TUNE_X86-SAME: {{$}}
Expand Down Expand Up @@ -399,6 +408,9 @@
// TUNE_X86_64-SAME: {{^}}, znver4
// TUNE_X86_64-SAME: {{^}}, znver5
// TUNE_X86_64-SAME: {{^}}, znver6
// TUNE_X86_64-SAME: {{^}}, c86-4g-m4
// TUNE_X86_64-SAME: {{^}}, c86-4g-m6
// TUNE_X86_64-SAME: {{^}}, c86-4g-m7
// TUNE_X86_64-SAME: {{^}}, x86-64
// TUNE_X86_64-SAME: {{^}}, geode
// TUNE_X86_64-SAME: {{$}}
Loading
Loading