[llvm-branch-commits] [llvm-branch] r181949 - Merging r181792:

[Bill Wendling]

Author: void
Date: Wed May 15 19:16:45 2013
New Revision: 181949

URL: http://llvm.org/viewvc/llvm-project?rev=181949&view=rev
Log:
Merging r181792:
------------------------------------------------------------------------
r181792 | tstellar | 2013-05-14 07:42:56 -0700 (Tue, 14 May 2013) | 8 lines

R600/SI: Add processor type for Hainan asic

Patch by: Alex Deucher

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

NOTE: This is a candidate for the 3.3 branch.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/lib/Target/R600/AMDILDeviceInfo.cpp
    llvm/branches/release_33/lib/Target/R600/Processors.td

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 15 19:16:45 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181586,181800,181842
+/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181586,181792,181800,181842

Modified: llvm/branches/release_33/lib/Target/R600/AMDILDeviceInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/Target/R600/AMDILDeviceInfo.cpp?rev=181949&r1=181948&r2=181949&view=diff
==============================================================================
--- llvm/branches/release_33/lib/Target/R600/AMDILDeviceInfo.cpp (original)
+++ llvm/branches/release_33/lib/Target/R600/AMDILDeviceInfo.cpp Wed May 15 19:16:45 2013
@@ -81,7 +81,8 @@ AMDGPUDevice* getDeviceFromName(const st
     return new AMDGPUNIDevice(ptr);
   } else if (deviceName == "SI" ||
              deviceName == "tahiti" || deviceName == "pitcairn" ||
-             deviceName == "verde"  || deviceName == "oland") {
+             deviceName == "verde"  || deviceName == "oland" ||
+	     deviceName == "hainan") {
     return new AMDGPUSIDevice(ptr);
   } else {
 #if DEBUG

Modified: llvm/branches/release_33/lib/Target/R600/Processors.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/Target/R600/Processors.td?rev=181949&r1=181948&r2=181949&view=diff
==============================================================================
--- llvm/branches/release_33/lib/Target/R600/Processors.td (original)
+++ llvm/branches/release_33/lib/Target/R600/Processors.td Wed May 15 19:16:45 2013
@@ -45,3 +45,4 @@ def : Proc<"tahiti",     SI_Itin, [Featu
 def : Proc<"pitcairn",   SI_Itin, [Feature64BitPtr, FeatureFP64]>;
 def : Proc<"verde",      SI_Itin, [Feature64BitPtr, FeatureFP64]>;
 def : Proc<"oland",      SI_Itin, [Feature64BitPtr, FeatureFP64]>;
+def : Proc<"hainan",     SI_Itin, [Feature64BitPtr, FeatureFP64]>;