This revision was automatically updated to reflect the committed changes. Closed by commit rL262228: AMDGPU: Add missing Volcanic Islands targets (authored by tstellar).
Changed prior to commit: http://reviews.llvm.org/D17645?vs=49184&id=49372#toc Repository: rL LLVM http://reviews.llvm.org/D17645 Files: cfe/trunk/lib/Basic/Targets.cpp cfe/trunk/test/Driver/r600-mcpu.cl Index: cfe/trunk/test/Driver/r600-mcpu.cl =================================================================== --- cfe/trunk/test/Driver/r600-mcpu.cl +++ cfe/trunk/test/Driver/r600-mcpu.cl @@ -38,6 +38,8 @@ // RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=tonga %s -o - 2>&1 | FileCheck --check-prefix=TONGA-CHECK %s // RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=iceland %s -o - 2>&1 | FileCheck --check-prefix=ICELAND-CHECK %s // RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=carrizo %s -o - 2>&1 | FileCheck --check-prefix=CARRIZO-CHECK %s +// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=fiji %s -o - 2>&1 | FileCheck --check-prefix=FIJI-CHECK %s +// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=stoney %s -o - 2>&1 | FileCheck --check-prefix=STONEY-CHECK %s // R600-CHECK: "-target-cpu" "r600" // RS880-CHECK: "-target-cpu" "rs880" @@ -66,3 +68,5 @@ // TONGA-CHECK: "-target-cpu" "tonga" // ICELAND-CHECK: "-target-cpu" "iceland" // CARRIZO-CHECK: "-target-cpu" "carrizo" +// FIJI-CHECK: "-target-cpu" "fiji" +// STONEY-CHECK: "-target-cpu" "stoney" Index: cfe/trunk/lib/Basic/Targets.cpp =================================================================== --- cfe/trunk/lib/Basic/Targets.cpp +++ cfe/trunk/lib/Basic/Targets.cpp @@ -1931,6 +1931,8 @@ .Case("tonga", GK_VOLCANIC_ISLANDS) .Case("iceland", GK_VOLCANIC_ISLANDS) .Case("carrizo", GK_VOLCANIC_ISLANDS) + .Case("fiji", GK_VOLCANIC_ISLANDS) + .Case("stoney", GK_VOLCANIC_ISLANDS) .Default(GK_NONE); if (GPU == GK_NONE) {
Index: cfe/trunk/test/Driver/r600-mcpu.cl =================================================================== --- cfe/trunk/test/Driver/r600-mcpu.cl +++ cfe/trunk/test/Driver/r600-mcpu.cl @@ -38,6 +38,8 @@ // RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=tonga %s -o - 2>&1 | FileCheck --check-prefix=TONGA-CHECK %s // RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=iceland %s -o - 2>&1 | FileCheck --check-prefix=ICELAND-CHECK %s // RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=carrizo %s -o - 2>&1 | FileCheck --check-prefix=CARRIZO-CHECK %s +// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=fiji %s -o - 2>&1 | FileCheck --check-prefix=FIJI-CHECK %s +// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=stoney %s -o - 2>&1 | FileCheck --check-prefix=STONEY-CHECK %s // R600-CHECK: "-target-cpu" "r600" // RS880-CHECK: "-target-cpu" "rs880" @@ -66,3 +68,5 @@ // TONGA-CHECK: "-target-cpu" "tonga" // ICELAND-CHECK: "-target-cpu" "iceland" // CARRIZO-CHECK: "-target-cpu" "carrizo" +// FIJI-CHECK: "-target-cpu" "fiji" +// STONEY-CHECK: "-target-cpu" "stoney" Index: cfe/trunk/lib/Basic/Targets.cpp =================================================================== --- cfe/trunk/lib/Basic/Targets.cpp +++ cfe/trunk/lib/Basic/Targets.cpp @@ -1931,6 +1931,8 @@ .Case("tonga", GK_VOLCANIC_ISLANDS) .Case("iceland", GK_VOLCANIC_ISLANDS) .Case("carrizo", GK_VOLCANIC_ISLANDS) + .Case("fiji", GK_VOLCANIC_ISLANDS) + .Case("stoney", GK_VOLCANIC_ISLANDS) .Default(GK_NONE); if (GPU == GK_NONE) {
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits