1 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/drivers/radeon/AMDILDeviceInfo.cpp b/src/gallium/drivers/radeon/AMDILDeviceInfo.cpp
index 25cb5e50d9c..b2f7cfb3092 100644
--- a/src/gallium/drivers/radeon/AMDILDeviceInfo.cpp
+++ b/src/gallium/drivers/radeon/AMDILDeviceInfo.cpp
@@ -15,19 +15,19 @@
 
 using namespace llvm;
 namespace llvm {
-namespace AMDILDeviceInfo {
-    AMDILDevice*
+namespace AMDGPUDeviceInfo {
+    AMDGPUDevice*
 getDeviceFromName(const std::string &deviceName, AMDGPUSubtarget *ptr,
                   bool is64bit, bool is64on32bit)
 {
     if (deviceName.c_str()[2] == '7') {
         switch (deviceName.c_str()[3]) {
             case '1':
-                return new AMDIL710Device(ptr);
+                return new AMDGPU710Device(ptr);
             case '7':
-                return new AMDIL770Device(ptr);
+                return new AMDGPU770Device(ptr);
             default:
-                return new AMDIL7XXDevice(ptr);
+                return new AMDGPU7XXDevice(ptr);
         };
     } else if (deviceName == "cypress") {
 #if DEBUG
@@ -35,28 +35,28 @@ getDeviceFromName(const std::string &deviceName, AMDGPUSubtarget *ptr,
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-        return new AMDILCypressDevice(ptr);
+        return new AMDGPUCypressDevice(ptr);
     } else if (deviceName == "juniper") {
 #if DEBUG
       assert(!is64bit && "This device does not support 64bit pointers!");
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-        return new AMDILEvergreenDevice(ptr);
+        return new AMDGPUEvergreenDevice(ptr);
     } else if (deviceName == "redwood") {
 #if DEBUG
       assert(!is64bit && "This device does not support 64bit pointers!");
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-      return new AMDILRedwoodDevice(ptr);
+      return new AMDGPURedwoodDevice(ptr);
     } else if (deviceName == "cedar") {
 #if DEBUG
       assert(!is64bit && "This device does not support 64bit pointers!");
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-        return new AMDILCedarDevice(ptr);
+        return new AMDGPUCedarDevice(ptr);
     } else if (deviceName == "barts"
       || deviceName == "turks") {
 #if DEBUG
@@ -64,31 +64,31 @@ getDeviceFromName(const std::string &deviceName, AMDGPUSubtarget *ptr,
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-        return new AMDILNIDevice(ptr);
+        return new AMDGPUNIDevice(ptr);
     } else if (deviceName == "cayman") {
 #if DEBUG
       assert(!is64bit && "This device does not support 64bit pointers!");
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-        return new AMDILCaymanDevice(ptr);
+        return new AMDGPUCaymanDevice(ptr);
     } else if (deviceName == "caicos") {
 #if DEBUG
       assert(!is64bit && "This device does not support 64bit pointers!");
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-        return new AMDILNIDevice(ptr);
+        return new AMDGPUNIDevice(ptr);
     } else if (deviceName == "SI") {
-        return new AMDILSIDevice(ptr);
+        return new AMDGPUSIDevice(ptr);
     } else {
 #if DEBUG
       assert(!is64bit && "This device does not support 64bit pointers!");
       assert(!is64on32bit && "This device does not support 64bit"
           " on 32bit pointers!");
 #endif
-        return new AMDIL7XXDevice(ptr);
+        return new AMDGPU7XXDevice(ptr);
     }
 }
-} // End namespace AMDILDeviceInfo
+} // End namespace AMDGPUDeviceInfo
 } // End namespace llvm