diff options
| author | Bill Wendling <isanbard@gmail.com> | 2014-08-04 18:36:16 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2014-08-04 18:36:16 +0000 |
| commit | 654c74467cdc2d6adb4d5e4ae29fd16a4f742b48 (patch) | |
| tree | 2c729dedf3d2f757e6fc3149f505485eff3934d2 | |
| parent | f2104bd2b69f96a0bf7052c69eb3083a0546ff4b (diff) | |
Merging r213999:
------------------------------------------------------------------------
r213999 | tstellar | 2014-07-25 18:05:20 -0700 (Fri, 25 Jul 2014) | 1 line
R600: Add processor type for Mullins
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_35@214748 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Basic/Targets.cpp | 1 | ||||
| -rw-r--r-- | test/Driver/r600-mcpu.cl | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index fe72fe1e19..9b118f0af6 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -1566,6 +1566,7 @@ public: .Case("kabini", GK_SEA_ISLANDS) .Case("kaveri", GK_SEA_ISLANDS) .Case("hawaii", GK_SEA_ISLANDS) + .Case("mullins", GK_SEA_ISLANDS) .Default(GK_NONE); if (GPU == GK_NONE) { diff --git a/test/Driver/r600-mcpu.cl b/test/Driver/r600-mcpu.cl index 7238ff4fbd..47c018512b 100644 --- a/test/Driver/r600-mcpu.cl +++ b/test/Driver/r600-mcpu.cl @@ -34,6 +34,7 @@ // RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=kabini %s -o - 2>&1 | FileCheck --check-prefix=KABINI-CHECK %s // RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=kaveri %s -o - 2>&1 | FileCheck --check-prefix=KAVERI-CHECK %s // RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=hawaii %s -o - 2>&1 | FileCheck --check-prefix=HAWAII-CHECK %s +// RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=mullins %s -o - 2>&1 | FileCheck --check-prefix=MULLINS-CHECK %s // R600-CHECK: "-target-cpu" "r600" // RS880-CHECK: "-target-cpu" "rs880" @@ -58,3 +59,4 @@ // KABINI-CHECK: "-target-cpu" "kabini" // KAVERI-CHECK: "-target-cpu" "kaveri" // HAWAII-CHECK: "-target-cpu" "hawaii" +// MULLINS-CHECK: "-target-cpu" "mullins" |