[PATCH] D23746: Basic/Targets.cpp: Add polaris10 and polaris11 gpus

2016-08-20 Thread Niels Ole Salscheider via cfe-commits 
olesalscheider created this revision.
olesalscheider added reviewers: cfe-commits, tstellarAMD, arsenm.

https://reviews.llvm.org/D23746

Files:
  lib/Basic/Targets.cpp

Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -2110,21 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_VOLCANIC_ISLANDS)
+  .Case("polaris11", GK_VOLCANIC_ISLANDS)
   .Default(GK_NONE);
   }
 


Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -2110,21 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_VOLCANIC_ISLANDS)
+  .Case("polaris11", GK_VOLCANIC_ISLANDS)
   .Default(GK_NONE);
   }
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D23746: Basic/Targets.cpp: Add polaris10 and polaris11 gpus

2016-08-20 Thread Niels Ole Salscheider via cfe-commits 
olesalscheider updated this revision to Diff 68779.

https://reviews.llvm.org/D23746

Files:
  lib/Basic/Targets.cpp

Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -1955,7 +1955,8 @@
 GK_CAYMAN,
 GK_SOUTHERN_ISLANDS,
 GK_SEA_ISLANDS,
-GK_VOLCANIC_ISLANDS
+GK_VOLCANIC_ISLANDS,
+GK_ARCTIC_ISLANDS
   } GPU;
 
   bool hasFP64:1;
@@ -2110,21 +2111,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_ARCTIC_ISLANDS)
+  .Case("polaris11", GK_ARCTIC_ISLANDS)
   .Default(GK_NONE);
   }
 
@@ -2257,6 +2260,7 @@
 case GK_SEA_ISLANDS:
   break;
 
+case GK_ARCTIC_ISLANDS:
 case GK_VOLCANIC_ISLANDS:
   Features["s-memrealtime"] = true;
   Features["16-bit-insts"] = true;


Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -1955,7 +1955,8 @@
 GK_CAYMAN,
 GK_SOUTHERN_ISLANDS,
 GK_SEA_ISLANDS,
-GK_VOLCANIC_ISLANDS
+GK_VOLCANIC_ISLANDS,
+GK_ARCTIC_ISLANDS
   } GPU;
 
   bool hasFP64:1;
@@ -2110,21 +2111,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_ARCTIC_ISLANDS)
+  .Case("polaris11", GK_ARCTIC_ISLANDS)
   .Default(GK_NONE);
   }
 
@@ -2257,6 +2260,7 @@
 case GK_SEA_ISLANDS:
   break;
 
+case GK_ARCTIC_ISLANDS:
 case GK_VOLCANIC_ISLANDS:
   Features["s-memrealtime"] = true;
   Features["16-bit-insts"] = true;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D23746: Basic/Targets.cpp: Add polaris10 and polaris11 gpus

2016-08-27 Thread Niels Ole Salscheider via cfe-commits 
olesalscheider added inline comments.


Comment at: lib/Basic/Targets.cpp:1959
@@ -1959,1 +1958,3 @@
+GK_VOLCANIC_ISLANDS,
+GK_ARCTIC_ISLANDS
   } GPU;

arsenm wrote:
> tstellarAMD wrote:
> > We're trying to move to more descriptive GPU family names, so this should 
> > be GK_GFX8 instead of GK_ARCTIC_ISLANDS.  GK_VOLCANIC_ISLANDS should also 
> > be changed to GK_GFX8, but that can be done in another patch, and would not 
> > be a prerequisite for this patch. 
> For now I think polaris10/11 should just be left as VOLCANIC_ISLANDS
Ok... I'll leave it as VOLCANIC_ISLANDS and propose a follow-up patch that 
replaces all GCN names then.


https://reviews.llvm.org/D23746



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D23746: Basic/Targets.cpp: Add polaris10 and polaris11 gpus

2016-08-27 Thread Niels Ole Salscheider via cfe-commits 
olesalscheider updated this revision to Diff 69485.

https://reviews.llvm.org/D23746

Files:
  lib/Basic/Targets.cpp

Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -2110,21 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_VOLCANIC_ISLANDS)
+  .Case("polaris11", GK_VOLCANIC_ISLANDS)
   .Default(GK_NONE);
   }
 


Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -2110,21 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_VOLCANIC_ISLANDS)
+  .Case("polaris11", GK_VOLCANIC_ISLANDS)
   .Default(GK_NONE);
   }
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D23957: Replace the Radeon GCN GPU family names by more descriptive ones

2016-08-27 Thread Niels Ole Salscheider via cfe-commits 
olesalscheider created this revision.
olesalscheider added reviewers: cfe-commits, arsenm, tstellarAMD.

https://reviews.llvm.org/D23957

Files:
  lib/Basic/Targets.cpp

Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -1953,9 +1953,9 @@
 GK_EVERGREEN_DOUBLE_OPS,
 GK_NORTHERN_ISLANDS,
 GK_CAYMAN,
-GK_SOUTHERN_ISLANDS,
-GK_SEA_ISLANDS,
-GK_VOLCANIC_ISLANDS
+GK_GFX6,
+GK_GFX7,
+GK_GFX8
   } GPU;
 
   bool hasFP64:1;
@@ -1970,7 +1970,7 @@
 public:
   AMDGPUTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
 : TargetInfo(Triple) ,
-  GPU(isAMDGCN(Triple) ? GK_SOUTHERN_ISLANDS : GK_R600),
+  GPU(isAMDGCN(Triple) ? GK_GFX6 : GK_R600),
   hasFP64(false),
   hasFMAF(false),
   hasLDEXPF(false),
@@ -2110,23 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
-  .Case("verde", GK_SOUTHERN_ISLANDS)
-  .Case("oland", GK_SOUTHERN_ISLANDS)
-  .Case("hainan",GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",   GK_SEA_ISLANDS)
-  .Case("kabini",GK_SEA_ISLANDS)
-  .Case("kaveri",GK_SEA_ISLANDS)
-  .Case("hawaii",GK_SEA_ISLANDS)
-  .Case("mullins",   GK_SEA_ISLANDS)
-  .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)
-  .Case("polaris10", GK_VOLCANIC_ISLANDS)
-  .Case("polaris11", GK_VOLCANIC_ISLANDS)
+  .Case("tahiti",GK_GFX6)
+  .Case("pitcairn",  GK_GFX6)
+  .Case("verde", GK_GFX6)
+  .Case("oland", GK_GFX6)
+  .Case("hainan",GK_GFX6)
+  .Case("bonaire",   GK_GFX7)
+  .Case("kabini",GK_GFX7)
+  .Case("kaveri",GK_GFX7)
+  .Case("hawaii",GK_GFX7)
+  .Case("mullins",   GK_GFX7)
+  .Case("tonga", GK_GFX8)
+  .Case("iceland",   GK_GFX8)
+  .Case("carrizo",   GK_GFX8)
+  .Case("fiji",  GK_GFX8)
+  .Case("stoney",GK_GFX8)
+  .Case("polaris10", GK_GFX8)
+  .Case("polaris11", GK_GFX8)
   .Default(GK_NONE);
   }
 
@@ -2153,7 +2153,7 @@
   Opts.cl_khr_local_int32_base_atomics = 1;
   Opts.cl_khr_local_int32_extended_atomics = 1;
 }
-if (GPU >= GK_SOUTHERN_ISLANDS) {
+if (GPU >= GK_GFX6) {
   Opts.cl_khr_fp16 = 1;
   Opts.cl_khr_int64_base_atomics = 1;
   Opts.cl_khr_int64_extended_atomics = 1;
@@ -2255,11 +2255,11 @@
   CPU = "tahiti";
 
 switch (parseAMDGCNName(CPU)) {
-case GK_SOUTHERN_ISLANDS:
-case GK_SEA_ISLANDS:
+case GK_GFX6:
+case GK_GFX7:
   break;
 
-case GK_VOLCANIC_ISLANDS:
+case GK_GFX8:
   Features["s-memrealtime"] = true;
   Features["16-bit-insts"] = true;
   break;


Index: lib/Basic/Targets.cpp
===
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -1953,9 +1953,9 @@
 GK_EVERGREEN_DOUBLE_OPS,
 GK_NORTHERN_ISLANDS,
 GK_CAYMAN,
-GK_SOUTHERN_ISLANDS,
-GK_SEA_ISLANDS,
-GK_VOLCANIC_ISLANDS
+GK_GFX6,
+GK_GFX7,
+GK_GFX8
   } GPU;
 
   bool hasFP64:1;
@@ -1970,7 +1970,7 @@
 public:
   AMDGPUTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
 : TargetInfo(Triple) ,
-  GPU(isAMDGCN(Triple) ? GK_SOUTHERN_ISLANDS : GK_R600),
+  GPU(isAMDGCN(Triple) ? GK_GFX6 : GK_R600),
   hasFP64(false),
   hasFMAF(false),
   hasLDEXPF(false),
@@ -2110,23 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
-  .Case("verde", GK_SOUTHERN_ISLANDS)
-  .Case("oland", GK_SOUTHERN_ISLANDS)
-  .Case("hainan",GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",   GK_SEA_ISLANDS)
-  .Case("kabini",GK_SEA_ISLANDS)
-  .Case("kaveri",GK_SEA_ISLANDS)
-  .Case("hawaii",GK_SEA_ISLANDS)
-  .Case("mullins",   GK_SEA_ISLANDS)
-  .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)
-  .Case("polaris10", GK_VOLCANIC_ISLANDS)
-  .Case("polaris11", GK_VOLCANIC_ISLANDS)
+  .Case("tahiti",GK_GFX6)
+  .Case("pitcairn",  GK_GFX6)
+  .Case("verde", GK_GFX6)
+  .Case("oland", GK_GFX6)
+  .Case("hainan",GK_GFX6)
+  .Case("bonaire",   GK_GFX7)
+  .Case("kabini",GK_GFX7)
+  .Case("kaveri",GK_GFX7)
+  .Case("hawaii",GK_GFX7)
+  .Case("mullins",   GK_GFX7)
+

r280120 - Basic/Targets.cpp: Add polaris10 and polaris11 gpus

2016-08-30 Thread Niels Ole Salscheider via cfe-commits 
Author: olesalscheider
Date: Tue Aug 30 13:00:22 2016
New Revision: 280120

URL: http://llvm.org/viewvc/llvm-project?rev=280120&view=rev
Log:
Basic/Targets.cpp: Add polaris10 and polaris11 gpus

Differential Revision: https://reviews.llvm.org/D23746

Modified:
cfe/trunk/lib/Basic/Targets.cpp

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=280120&r1=280119&r2=280120&view=diff
==
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Tue Aug 30 13:00:22 2016
@@ -2110,21 +2110,23 @@ public:
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_VOLCANIC_ISLANDS)
+  .Case("polaris11", GK_VOLCANIC_ISLANDS)
   .Default(GK_NONE);
   }
 


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[libclc] r280121 - configure.py: Add polaris10 and polaris11

2016-08-30 Thread Niels Ole Salscheider via cfe-commits 
Author: olesalscheider
Date: Tue Aug 30 13:00:41 2016
New Revision: 280121

URL: http://llvm.org/viewvc/llvm-project?rev=280121&view=rev
Log:
configure.py: Add polaris10 and polaris11

Modified:
libclc/trunk/configure.py

Modified: libclc/trunk/configure.py
URL: 
http://llvm.org/viewvc/llvm-project/libclc/trunk/configure.py?rev=280121&r1=280120&r2=280121&view=diff
==
--- libclc/trunk/configure.py (original)
+++ libclc/trunk/configure.py Tue Aug 30 13:00:41 2016
@@ -96,9 +96,9 @@ available_targets = {
 {'gpu' : 'barts',   'aliases' : ['turks', 'caicos'] },
 {'gpu' : 'cayman',  'aliases' : ['aruba']} ]},
   'amdgcn--': { 'devices' :
-[{'gpu' : 'tahiti', 'aliases' : ['pitcairn', 'verde', 'oland', 
'hainan', 'bonaire', 'kabini', 'kaveri', 
'hawaii','mullins','tonga','carrizo','iceland','fiji','stoney']} ]},
+[{'gpu' : 'tahiti', 'aliases' : ['pitcairn', 'verde', 'oland', 
'hainan', 'bonaire', 'kabini', 'kaveri', 
'hawaii','mullins','tonga','carrizo','iceland','fiji','stoney','polaris10','polaris11']}
 ]},
   'amdgcn--amdhsa': { 'devices' :
-  [{'gpu' : '', 'aliases' : ['bonaire', 'hawaii', 
'kabini', 'kaveri', 'mullins', 'carrizo', 'stoney', 'fiji', 'iceland', 
'tonga']} ]},
+  [{'gpu' : '', 'aliases' : ['bonaire', 'hawaii', 
'kabini', 'kaveri', 'mullins', 'carrizo', 'stoney', 'fiji', 'iceland', 
'tonga','polaris10','polaris11']} ]},
   'nvptx--'   : { 'devices' : [{'gpu' : '', 'aliases' : []} ]},
   'nvptx64--' : { 'devices' : [{'gpu' : '', 'aliases' : []} ]},
   'nvptx--nvidiacl'   : { 'devices' : [{'gpu' : '', 'aliases' : []} ]},


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D23746: Basic/Targets.cpp: Add polaris10 and polaris11 gpus

2016-08-30 Thread Niels Ole Salscheider via cfe-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL280120: Basic/Targets.cpp: Add polaris10 and polaris11 gpus 
(authored by olesalscheider).

Changed prior to commit:
  https://reviews.llvm.org/D23746?vs=69485&id=69730#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23746

Files:
  cfe/trunk/lib/Basic/Targets.cpp

Index: cfe/trunk/lib/Basic/Targets.cpp
===
--- cfe/trunk/lib/Basic/Targets.cpp
+++ cfe/trunk/lib/Basic/Targets.cpp
@@ -2110,21 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_VOLCANIC_ISLANDS)
+  .Case("polaris11", GK_VOLCANIC_ISLANDS)
   .Default(GK_NONE);
   }
 


Index: cfe/trunk/lib/Basic/Targets.cpp
===
--- cfe/trunk/lib/Basic/Targets.cpp
+++ cfe/trunk/lib/Basic/Targets.cpp
@@ -2110,21 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",   GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn", GK_SOUTHERN_ISLANDS)
-  .Case("verde",GK_SOUTHERN_ISLANDS)
-  .Case("oland",GK_SOUTHERN_ISLANDS)
-  .Case("hainan",   GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",  GK_SEA_ISLANDS)
-  .Case("kabini",   GK_SEA_ISLANDS)
-  .Case("kaveri",   GK_SEA_ISLANDS)
-  .Case("hawaii",   GK_SEA_ISLANDS)
-  .Case("mullins",  GK_SEA_ISLANDS)
-  .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)
+  .Case("tahiti",GK_SOUTHERN_ISLANDS)
+  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
+  .Case("verde", GK_SOUTHERN_ISLANDS)
+  .Case("oland", GK_SOUTHERN_ISLANDS)
+  .Case("hainan",GK_SOUTHERN_ISLANDS)
+  .Case("bonaire",   GK_SEA_ISLANDS)
+  .Case("kabini",GK_SEA_ISLANDS)
+  .Case("kaveri",GK_SEA_ISLANDS)
+  .Case("hawaii",GK_SEA_ISLANDS)
+  .Case("mullins",   GK_SEA_ISLANDS)
+  .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)
+  .Case("polaris10", GK_VOLCANIC_ISLANDS)
+  .Case("polaris11", GK_VOLCANIC_ISLANDS)
   .Default(GK_NONE);
   }
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r280587 - Replace the Radeon GCN GPU family names by more descriptive ones

2016-09-03 Thread Niels Ole Salscheider via cfe-commits 
Author: olesalscheider
Date: Sat Sep  3 02:13:54 2016
New Revision: 280587

URL: http://llvm.org/viewvc/llvm-project?rev=280587&view=rev
Log:
Replace the Radeon GCN GPU family names by more descriptive ones

Differential Revision: https://reviews.llvm.org/D23957

Modified:
cfe/trunk/lib/Basic/Targets.cpp

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=280587&r1=280586&r2=280587&view=diff
==
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Sat Sep  3 02:13:54 2016
@@ -1953,9 +1953,9 @@ class AMDGPUTargetInfo final : public Ta
 GK_EVERGREEN_DOUBLE_OPS,
 GK_NORTHERN_ISLANDS,
 GK_CAYMAN,
-GK_SOUTHERN_ISLANDS,
-GK_SEA_ISLANDS,
-GK_VOLCANIC_ISLANDS
+GK_GFX6,
+GK_GFX7,
+GK_GFX8
   } GPU;
 
   bool hasFP64:1;
@@ -1970,7 +1970,7 @@ class AMDGPUTargetInfo final : public Ta
 public:
   AMDGPUTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
 : TargetInfo(Triple) ,
-  GPU(isAMDGCN(Triple) ? GK_SOUTHERN_ISLANDS : GK_R600),
+  GPU(isAMDGCN(Triple) ? GK_GFX6 : GK_R600),
   hasFP64(false),
   hasFMAF(false),
   hasLDEXPF(false),
@@ -2110,23 +2110,23 @@ public:
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
-  .Case("verde", GK_SOUTHERN_ISLANDS)
-  .Case("oland", GK_SOUTHERN_ISLANDS)
-  .Case("hainan",GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",   GK_SEA_ISLANDS)
-  .Case("kabini",GK_SEA_ISLANDS)
-  .Case("kaveri",GK_SEA_ISLANDS)
-  .Case("hawaii",GK_SEA_ISLANDS)
-  .Case("mullins",   GK_SEA_ISLANDS)
-  .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)
-  .Case("polaris10", GK_VOLCANIC_ISLANDS)
-  .Case("polaris11", GK_VOLCANIC_ISLANDS)
+  .Case("tahiti",GK_GFX6)
+  .Case("pitcairn",  GK_GFX6)
+  .Case("verde", GK_GFX6)
+  .Case("oland", GK_GFX6)
+  .Case("hainan",GK_GFX6)
+  .Case("bonaire",   GK_GFX7)
+  .Case("kabini",GK_GFX7)
+  .Case("kaveri",GK_GFX7)
+  .Case("hawaii",GK_GFX7)
+  .Case("mullins",   GK_GFX7)
+  .Case("tonga", GK_GFX8)
+  .Case("iceland",   GK_GFX8)
+  .Case("carrizo",   GK_GFX8)
+  .Case("fiji",  GK_GFX8)
+  .Case("stoney",GK_GFX8)
+  .Case("polaris10", GK_GFX8)
+  .Case("polaris11", GK_GFX8)
   .Default(GK_NONE);
   }
 
@@ -2153,7 +2153,7 @@ public:
   Opts.cl_khr_local_int32_base_atomics = 1;
   Opts.cl_khr_local_int32_extended_atomics = 1;
 }
-if (GPU >= GK_SOUTHERN_ISLANDS) {
+if (GPU >= GK_GFX6) {
   Opts.cl_khr_fp16 = 1;
   Opts.cl_khr_int64_base_atomics = 1;
   Opts.cl_khr_int64_extended_atomics = 1;
@@ -2255,11 +2255,11 @@ bool AMDGPUTargetInfo::initFeatureMap(
   CPU = "tahiti";
 
 switch (parseAMDGCNName(CPU)) {
-case GK_SOUTHERN_ISLANDS:
-case GK_SEA_ISLANDS:
+case GK_GFX6:
+case GK_GFX7:
   break;
 
-case GK_VOLCANIC_ISLANDS:
+case GK_GFX8:
   Features["s-memrealtime"] = true;
   Features["16-bit-insts"] = true;
   break;


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D23957: Replace the Radeon GCN GPU family names by more descriptive ones

2016-09-03 Thread Niels Ole Salscheider via cfe-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL280587: Replace the Radeon GCN GPU family names by more 
descriptive ones (authored by olesalscheider).

Changed prior to commit:
  https://reviews.llvm.org/D23957?vs=69486&id=70264#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23957

Files:
  cfe/trunk/lib/Basic/Targets.cpp

Index: cfe/trunk/lib/Basic/Targets.cpp
===
--- cfe/trunk/lib/Basic/Targets.cpp
+++ cfe/trunk/lib/Basic/Targets.cpp
@@ -1953,9 +1953,9 @@
 GK_EVERGREEN_DOUBLE_OPS,
 GK_NORTHERN_ISLANDS,
 GK_CAYMAN,
-GK_SOUTHERN_ISLANDS,
-GK_SEA_ISLANDS,
-GK_VOLCANIC_ISLANDS
+GK_GFX6,
+GK_GFX7,
+GK_GFX8
   } GPU;
 
   bool hasFP64:1;
@@ -1970,7 +1970,7 @@
 public:
   AMDGPUTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
 : TargetInfo(Triple) ,
-  GPU(isAMDGCN(Triple) ? GK_SOUTHERN_ISLANDS : GK_R600),
+  GPU(isAMDGCN(Triple) ? GK_GFX6 : GK_R600),
   hasFP64(false),
   hasFMAF(false),
   hasLDEXPF(false),
@@ -2110,23 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
-  .Case("verde", GK_SOUTHERN_ISLANDS)
-  .Case("oland", GK_SOUTHERN_ISLANDS)
-  .Case("hainan",GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",   GK_SEA_ISLANDS)
-  .Case("kabini",GK_SEA_ISLANDS)
-  .Case("kaveri",GK_SEA_ISLANDS)
-  .Case("hawaii",GK_SEA_ISLANDS)
-  .Case("mullins",   GK_SEA_ISLANDS)
-  .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)
-  .Case("polaris10", GK_VOLCANIC_ISLANDS)
-  .Case("polaris11", GK_VOLCANIC_ISLANDS)
+  .Case("tahiti",GK_GFX6)
+  .Case("pitcairn",  GK_GFX6)
+  .Case("verde", GK_GFX6)
+  .Case("oland", GK_GFX6)
+  .Case("hainan",GK_GFX6)
+  .Case("bonaire",   GK_GFX7)
+  .Case("kabini",GK_GFX7)
+  .Case("kaveri",GK_GFX7)
+  .Case("hawaii",GK_GFX7)
+  .Case("mullins",   GK_GFX7)
+  .Case("tonga", GK_GFX8)
+  .Case("iceland",   GK_GFX8)
+  .Case("carrizo",   GK_GFX8)
+  .Case("fiji",  GK_GFX8)
+  .Case("stoney",GK_GFX8)
+  .Case("polaris10", GK_GFX8)
+  .Case("polaris11", GK_GFX8)
   .Default(GK_NONE);
   }
 
@@ -2153,7 +2153,7 @@
   Opts.cl_khr_local_int32_base_atomics = 1;
   Opts.cl_khr_local_int32_extended_atomics = 1;
 }
-if (GPU >= GK_SOUTHERN_ISLANDS) {
+if (GPU >= GK_GFX6) {
   Opts.cl_khr_fp16 = 1;
   Opts.cl_khr_int64_base_atomics = 1;
   Opts.cl_khr_int64_extended_atomics = 1;
@@ -2255,11 +2255,11 @@
   CPU = "tahiti";
 
 switch (parseAMDGCNName(CPU)) {
-case GK_SOUTHERN_ISLANDS:
-case GK_SEA_ISLANDS:
+case GK_GFX6:
+case GK_GFX7:
   break;
 
-case GK_VOLCANIC_ISLANDS:
+case GK_GFX8:
   Features["s-memrealtime"] = true;
   Features["16-bit-insts"] = true;
   break;


Index: cfe/trunk/lib/Basic/Targets.cpp
===
--- cfe/trunk/lib/Basic/Targets.cpp
+++ cfe/trunk/lib/Basic/Targets.cpp
@@ -1953,9 +1953,9 @@
 GK_EVERGREEN_DOUBLE_OPS,
 GK_NORTHERN_ISLANDS,
 GK_CAYMAN,
-GK_SOUTHERN_ISLANDS,
-GK_SEA_ISLANDS,
-GK_VOLCANIC_ISLANDS
+GK_GFX6,
+GK_GFX7,
+GK_GFX8
   } GPU;
 
   bool hasFP64:1;
@@ -1970,7 +1970,7 @@
 public:
   AMDGPUTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
 : TargetInfo(Triple) ,
-  GPU(isAMDGCN(Triple) ? GK_SOUTHERN_ISLANDS : GK_R600),
+  GPU(isAMDGCN(Triple) ? GK_GFX6 : GK_R600),
   hasFP64(false),
   hasFMAF(false),
   hasLDEXPF(false),
@@ -2110,23 +2110,23 @@
 
   static GPUKind parseAMDGCNName(StringRef Name) {
 return llvm::StringSwitch(Name)
-  .Case("tahiti",GK_SOUTHERN_ISLANDS)
-  .Case("pitcairn",  GK_SOUTHERN_ISLANDS)
-  .Case("verde", GK_SOUTHERN_ISLANDS)
-  .Case("oland", GK_SOUTHERN_ISLANDS)
-  .Case("hainan",GK_SOUTHERN_ISLANDS)
-  .Case("bonaire",   GK_SEA_ISLANDS)
-  .Case("kabini",GK_SEA_ISLANDS)
-  .Case("kaveri",GK_SEA_ISLANDS)
-  .Case("hawaii",GK_SEA_ISLANDS)
-  .Case("mullins",   GK_SEA_ISLANDS)
-  .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)
-  .Case("polaris10", GK_VOLCANIC_ISLANDS)
-  .Case("polaris11", GK_VOLCANIC_ISLANDS)
+  .Case("tahiti",GK_GFX6)
+  .Case("pitcairn",  GK_GFX6)
+  .Case("ver

[libclc] r248780 - Implement tanh builtin

2015-09-29 Thread Niels Ole Salscheider via cfe-commits 
Author: olesalscheider
Date: Tue Sep 29 01:39:09 2015
New Revision: 248780

URL: http://llvm.org/viewvc/llvm-project?rev=248780&view=rev
Log:
Implement tanh builtin

This is a port from the AMD builtin library.

Added:
libclc/trunk/generic/include/clc/math/tanh.h
libclc/trunk/generic/include/clc/math/tanh.inc
libclc/trunk/generic/lib/math/tanh.cl
Modified:
libclc/trunk/generic/include/clc/clc.h
libclc/trunk/generic/lib/SOURCES

Modified: libclc/trunk/generic/include/clc/clc.h
URL: 
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/clc.h?rev=248780&r1=248779&r2=248780&view=diff
==
--- libclc/trunk/generic/include/clc/clc.h (original)
+++ libclc/trunk/generic/include/clc/clc.h Tue Sep 29 01:39:09 2015
@@ -77,6 +77,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

Added: libclc/trunk/generic/include/clc/math/tanh.h
URL: 
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/tanh.h?rev=248780&view=auto
==
--- libclc/trunk/generic/include/clc/math/tanh.h (added)
+++ libclc/trunk/generic/include/clc/math/tanh.h Tue Sep 29 01:39:09 2015
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to 
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define __CLC_BODY 
+#include 

Added: libclc/trunk/generic/include/clc/math/tanh.inc
URL: 
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/tanh.inc?rev=248780&view=auto
==
--- libclc/trunk/generic/include/clc/math/tanh.inc (added)
+++ libclc/trunk/generic/include/clc/math/tanh.inc Tue Sep 29 01:39:09 2015
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to 
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE tanh(__CLC_GENTYPE a);

Modified: libclc/trunk/generic/lib/SOURCES
URL: 
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/SOURCES?rev=248780&r1=248779&r2=248780&view=diff
==
--- libclc/trunk/generic/lib/SOURCES (original)
+++ libclc/trunk/generic/lib/SOURCES Tue Sep 29 01:39:09 2015
@@ -109,6 +109,7 @@ math/sinpi.cl
 math/clc_sqrt.cl
 math/sqrt.cl
 math/tan.cl
+math/tanh.cl
 relational/all.cl
 relational/any.cl
 relational/bitselect.cl

Added: libclc/trunk/generic/lib/math/tanh.cl
URL: 
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/tanh.cl?rev=248780&view=auto
==
--- libclc/trunk/generic/lib/math/tanh.cl (added)
+++ libclc/trunk/generic/lib/math/tanh.cl Tue Sep 29 01:39:09 2015
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c

Re: [PATCH] Install cmake files to lib/cmake/clang

2016-02-04 Thread Niels Ole Salscheider via cfe-commits 
Ping.

Am Monday 21 December 2015, 00:10:10 schrieb Niels Ole Salscheider:
> This is the right location for platform-specific files.
> 
> Also, search for LLVM's CMake files in this directory.
> ---
>  CMakeLists.txt | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 2c54e75..e4a839d 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -72,7 +72,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
>find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
>  NO_DEFAULT_PATH)
> 
> -  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
> +  set(LLVM_CMAKE_PATH
> "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
> set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
>if(EXISTS ${LLVMCONFIG_FILE})
>  list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
> @@ -587,24 +587,24 @@ if (CLANG_BUILT_STANDALONE OR CMAKE_VERSION
> VERSION_EQUAL 3 OR # Generate a list of CMake library targets so that other
> CMake projects can # link against them. LLVM calls its version of this file
> LLVMExports.cmake, but # the usual CMake convention seems to be
> ${Project}Targets.cmake. -  set(CLANG_INSTALL_PACKAGE_DIR
> share/clang/cmake)
> +  set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
>set(clang_cmake_builddir
> "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
> get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
>export(TARGETS ${CLANG_EXPORTS} FILE
> ${clang_cmake_builddir}/ClangTargets.cmake)
> 
> -  # Install a /share/clang/cmake/ClangConfig.cmake file so that
> +  # Install a /lib/cmake/clang/ClangConfig.cmake file so that
># find_package(Clang) works. Install the target list with it.
>install(EXPORT ClangTargets DESTINATION ${CLANG_INSTALL_PACKAGE_DIR})
> 
>install(FILES
>  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
> -DESTINATION share/clang/cmake)
> +DESTINATION lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
> 
># Also copy ClangConfig.cmake to the build directory so that dependent
> projects # can build against a build directory of Clang more easily.
>configure_file(
>  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
> -${CLANG_BINARY_DIR}/share/clang/cmake/ClangConfig.cmake
> +   
> ${CLANG_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake
> COPYONLY)
>  endif ()

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r259822 - Install cmake files to lib/cmake/clang

2016-02-04 Thread Niels Ole Salscheider via cfe-commits 
Author: olesalscheider
Date: Thu Feb  4 14:08:27 2016
New Revision: 259822

URL: http://llvm.org/viewvc/llvm-project?rev=259822&view=rev
Log:
Install cmake files to lib/cmake/clang

This is the right location for platform-specific files.

Also, search for LLVM's CMake files in this directory.

Modified:
cfe/trunk/CMakeLists.txt

Modified: cfe/trunk/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=259822&r1=259821&r2=259822&view=diff
==
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Thu Feb  4 14:08:27 2016
@@ -72,7 +72,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
   find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
 NO_DEFAULT_PATH)
 
-  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
+  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
   set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
   if(EXISTS ${LLVMCONFIG_FILE})
 list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
@@ -594,24 +594,24 @@ if (CLANG_BUILT_STANDALONE OR CMAKE_VERS
   # Generate a list of CMake library targets so that other CMake projects can
   # link against them. LLVM calls its version of this file LLVMExports.cmake, 
but
   # the usual CMake convention seems to be ${Project}Targets.cmake.
-  set(CLANG_INSTALL_PACKAGE_DIR share/clang/cmake)
+  set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
   set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
   get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
   export(TARGETS ${CLANG_EXPORTS} FILE 
${clang_cmake_builddir}/ClangTargets.cmake)
 
-  # Install a /share/clang/cmake/ClangConfig.cmake file so that
+  # Install a /lib/cmake/clang/ClangConfig.cmake file so that
   # find_package(Clang) works. Install the target list with it.
   install(EXPORT ClangTargets DESTINATION ${CLANG_INSTALL_PACKAGE_DIR})
 
   install(FILES
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
-DESTINATION share/clang/cmake)
+DESTINATION lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
 
   # Also copy ClangConfig.cmake to the build directory so that dependent 
projects
   # can build against a build directory of Clang more easily.
   configure_file(
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
-${CLANG_BINARY_DIR}/share/clang/cmake/ClangConfig.cmake
+${CLANG_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake
 COPYONLY)
 endif ()
 


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[libcxx] r259842 - Fix the search path for CMake files

2016-02-04 Thread Niels Ole Salscheider via cfe-commits 
Author: olesalscheider
Date: Thu Feb  4 17:17:20 2016
New Revision: 259842

URL: http://llvm.org/viewvc/llvm-project?rev=259842&view=rev
Log:
Fix the search path for CMake files

This allows to find the LLVM's CMake files after moving them in
r259821.

Modified:
libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake

Modified: libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake?rev=259842&r1=259841&r2=259842&view=diff
==
--- libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake (original)
+++ libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake Thu Feb  4 17:17:20 
2016
@@ -35,7 +35,7 @@ macro(find_llvm_parts)
 set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
 set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
 set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source 
tree")
-set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
+set(LLVM_CMAKE_PATH 
"${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
   else()
 set(LLVM_FOUND OFF)
 return()


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [libcxx] r259842 - Fix the search path for CMake files

2016-02-09 Thread Niels Ole Salscheider via cfe-commits 
On Tuesday, 9 February 2016, 18:09:37 CET, Marshall Clow wrote:
> On Thu, Feb 4, 2016 at 3:17 PM, Niels Ole Salscheider via cfe-commits <
> 
> cfe-commits@lists.llvm.org> wrote:
> > Author: olesalscheider
> > Date: Thu Feb  4 17:17:20 2016
> > New Revision: 259842
> > 
> > URL: http://llvm.org/viewvc/llvm-project?rev=259842&view=rev
> > Log:
> > Fix the search path for CMake files
> > 
> > This allows to find the LLVM's CMake files after moving them in
> > r259821.
> > 
> > Modified:
> > libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
> > 
> > I don't remember seeing any review about this.
> 
> -- Marshall

The review was only done here http://lists.llvm.org/pipermail/llvm-commits/
Week-of-Mon-20160201/330164.html and unfortunately not on cfe-commits...

Ole
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [libcxx] r259842 - Fix the search path for CMake files

2016-02-15 Thread Niels Ole Salscheider via cfe-commits 
Am Tuesday 09 February 2016, 17:06:58 schrieb Richard Smith:
> On Thu, Feb 4, 2016 at 3:17 PM, Niels Ole Salscheider via cfe-commits
> 
>  wrote:
> > Author: olesalscheider
> > Date: Thu Feb  4 17:17:20 2016
> > New Revision: 259842
> > 
> > URL: http://llvm.org/viewvc/llvm-project?rev=259842&view=rev
> > Log:
> > Fix the search path for CMake files
> > 
> > This allows to find the LLVM's CMake files after moving them in
> > r259821.
> 
> This breaks out-of-tree builds of libc++ with older versions of LLVM.
> What do you think of the attached patch? (Always look for the LLVM
> cmake modules in the source tree rather than sometimes also looking
> for them in the build tree.)

I think it might be better to try the new path and fall back to the old one if 
we want to support that case.

It seems that we can currently build libcxx without LLVM's source folder being 
around, even though it generates a warning. That would break with your patch.

> > Modified:
> > libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
> > 
> > Modified: libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
> > URL:
> > http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/HandleOutO
> > fTreeLLVM.cmake?rev=259842&r1=259841&r2=259842&view=diff
> > =
> > = --- libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake (original)
> > +++ libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake Thu Feb  4
> > 17:17:20 2016 @@ -35,7 +35,7 @@ macro(find_llvm_parts)
> > 
> >  set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to
> >  llvm/include")
> >  set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build
> >  tree")
> >  set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source
> >  tree")> 
> > -set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
> > +set(LLVM_CMAKE_PATH
> > "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")> 
> >else()
> >
> >  set(LLVM_FOUND OFF)
> >  return()
> > 
> > ___
> > cfe-commits mailing list
> > cfe-commits@lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] Install cmake files to lib/cmake/clang

2015-12-20 Thread Niels Ole Salscheider via cfe-commits 
This is the right location for platform-specific files.

Also, search for LLVM's CMake files in this directory.
---
 CMakeLists.txt | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c54e75..e4a839d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
   find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
 NO_DEFAULT_PATH)
 
-  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
+  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
   set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
   if(EXISTS ${LLVMCONFIG_FILE})
 list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
@@ -587,24 +587,24 @@ if (CLANG_BUILT_STANDALONE OR CMAKE_VERSION VERSION_EQUAL 
3 OR
   # Generate a list of CMake library targets so that other CMake projects can
   # link against them. LLVM calls its version of this file LLVMExports.cmake, 
but
   # the usual CMake convention seems to be ${Project}Targets.cmake.
-  set(CLANG_INSTALL_PACKAGE_DIR share/clang/cmake)
+  set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
   set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
   get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
   export(TARGETS ${CLANG_EXPORTS} FILE 
${clang_cmake_builddir}/ClangTargets.cmake)
 
-  # Install a /share/clang/cmake/ClangConfig.cmake file so that
+  # Install a /lib/cmake/clang/ClangConfig.cmake file so that
   # find_package(Clang) works. Install the target list with it.
   install(EXPORT ClangTargets DESTINATION ${CLANG_INSTALL_PACKAGE_DIR})
 
   install(FILES
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
-DESTINATION share/clang/cmake)
+DESTINATION lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
 
   # Also copy ClangConfig.cmake to the build directory so that dependent 
projects
   # can build against a build directory of Clang more easily.
   configure_file(
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
-${CLANG_BINARY_DIR}/share/clang/cmake/ClangConfig.cmake
+${CLANG_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake
 COPYONLY)
 endif ()
 
-- 
2.6.4

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] Install cmake files to lib/cmake/clang

2015-12-20 Thread Niels Ole Salscheider via cfe-commits 
On Monday 21 December 2015, 00:10:10 CET, you wrote:
> This is the right location for platform-specific files.
> 
> Also, search for LLVM's CMake files in this directory.

The corresponding LLVM patch can be found at 
http://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20151214/320963.html

> ---
>  CMakeLists.txt | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 2c54e75..e4a839d 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -72,7 +72,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
>find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
>  NO_DEFAULT_PATH)
> 
> -  set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
> +  set(LLVM_CMAKE_PATH
> "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
> set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
>if(EXISTS ${LLVMCONFIG_FILE})
>  list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
> @@ -587,24 +587,24 @@ if (CLANG_BUILT_STANDALONE OR CMAKE_VERSION
> VERSION_EQUAL 3 OR # Generate a list of CMake library targets so that other
> CMake projects can # link against them. LLVM calls its version of this file
> LLVMExports.cmake, but # the usual CMake convention seems to be
> ${Project}Targets.cmake. -  set(CLANG_INSTALL_PACKAGE_DIR
> share/clang/cmake)
> +  set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
>set(clang_cmake_builddir
> "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
> get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
>export(TARGETS ${CLANG_EXPORTS} FILE
> ${clang_cmake_builddir}/ClangTargets.cmake)
> 
> -  # Install a /share/clang/cmake/ClangConfig.cmake file so that
> +  # Install a /lib/cmake/clang/ClangConfig.cmake file so that
># find_package(Clang) works. Install the target list with it.
>install(EXPORT ClangTargets DESTINATION ${CLANG_INSTALL_PACKAGE_DIR})
> 
>install(FILES
>  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
> -DESTINATION share/clang/cmake)
> +DESTINATION lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
> 
># Also copy ClangConfig.cmake to the build directory so that dependent
> projects # can build against a build directory of Clang more easily.
>configure_file(
>  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ClangConfig.cmake
> -${CLANG_BINARY_DIR}/share/clang/cmake/ClangConfig.cmake
> +   
> ${CLANG_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake
> COPYONLY)
>  endif ()

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits