1 files changed, 33 insertions, 33 deletions
diff --git a/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp b/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp
index 39b9cb43929..37b7695c2c5 100644
--- a/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp
+++ b/src/gallium/drivers/radeon/AMDIL7XXDevice.cpp
@@ -15,7 +15,7 @@
 
 using namespace llvm;
 
-AMDIL7XXDevice::AMDIL7XXDevice(AMDGPUSubtarget *ST) : AMDILDevice(ST)
+AMDGPU7XXDevice::AMDGPU7XXDevice(AMDGPUSubtarget *ST) : AMDGPUDevice(ST)
 {
   setCaps();
   std::string name = mSTM->getDeviceName();
@@ -28,34 +28,34 @@ AMDIL7XXDevice::AMDIL7XXDevice(AMDGPUSubtarget *ST) : AMDILDevice(ST)
   }
 }
 
-AMDIL7XXDevice::~AMDIL7XXDevice()
+AMDGPU7XXDevice::~AMDGPU7XXDevice()
 {
 }
 
-void AMDIL7XXDevice::setCaps()
+void AMDGPU7XXDevice::setCaps()
 {
-  mSWBits.set(AMDILDeviceInfo::LocalMem);
+  mSWBits.set(AMDGPUDeviceInfo::LocalMem);
 }
 
-size_t AMDIL7XXDevice::getMaxLDSSize() const
+size_t AMDGPU7XXDevice::getMaxLDSSize() const
 {
-  if (usesHardware(AMDILDeviceInfo::LocalMem)) {
+  if (usesHardware(AMDGPUDeviceInfo::LocalMem)) {
     return MAX_LDS_SIZE_700;
   }
   return 0;
 }
 
-size_t AMDIL7XXDevice::getWavefrontSize() const
+size_t AMDGPU7XXDevice::getWavefrontSize() const
 {
-  return AMDILDevice::HalfWavefrontSize;
+  return AMDGPUDevice::HalfWavefrontSize;
 }
 
-uint32_t AMDIL7XXDevice::getGeneration() const
+uint32_t AMDGPU7XXDevice::getGeneration() const
 {
-  return AMDILDeviceInfo::HD4XXX;
+  return AMDGPUDeviceInfo::HD4XXX;
 }
 
-uint32_t AMDIL7XXDevice::getResourceID(uint32_t DeviceID) const
+uint32_t AMDGPU7XXDevice::getResourceID(uint32_t DeviceID) const
 {
   switch (DeviceID) {
   default:
@@ -67,18 +67,18 @@ uint32_t AMDIL7XXDevice::getResourceID(uint32_t DeviceID) const
   case ARENA_UAV_ID:
     break;
   case LDS_ID:
-    if (usesHardware(AMDILDeviceInfo::LocalMem)) {
+    if (usesHardware(AMDGPUDeviceInfo::LocalMem)) {
       return DEFAULT_LDS_ID;
     }
     break;
   case SCRATCH_ID:
-    if (usesHardware(AMDILDeviceInfo::PrivateMem)) {
+    if (usesHardware(AMDGPUDeviceInfo::PrivateMem)) {
       return DEFAULT_SCRATCH_ID;
     }
     break;
   case GDS_ID:
     assert(0 && "GDS UAV ID is not supported on this chip");
-    if (usesHardware(AMDILDeviceInfo::RegionMem)) {
+    if (usesHardware(AMDGPUDeviceInfo::RegionMem)) {
       return DEFAULT_GDS_ID;
     }
     break;
@@ -87,56 +87,56 @@ uint32_t AMDIL7XXDevice::getResourceID(uint32_t DeviceID) const
   return 0;
 }
 
-uint32_t AMDIL7XXDevice::getMaxNumUAVs() const
+uint32_t AMDGPU7XXDevice::getMaxNumUAVs() const
 {
   return 1;
 }
 
 AsmPrinter*
-AMDIL7XXDevice::getAsmPrinter(TargetMachine& TM, MCStreamer &Streamer) const
+AMDGPU7XXDevice::getAsmPrinter(TargetMachine& TM, MCStreamer &Streamer) const
 {
 #ifdef UPSTREAM_LLVM
-  return new AMDIL7XXAsmPrinter(TM, Streamer);
+  return new AMDGPU7XXAsmPrinter(TM, Streamer);
 #else
   return NULL;
 #endif
 }
 
-AMDIL770Device::AMDIL770Device(AMDGPUSubtarget *ST): AMDIL7XXDevice(ST)
+AMDGPU770Device::AMDGPU770Device(AMDGPUSubtarget *ST): AMDGPU7XXDevice(ST)
 {
   setCaps();
 }
 
-AMDIL770Device::~AMDIL770Device()
+AMDGPU770Device::~AMDGPU770Device()
 {
 }
 
-void AMDIL770Device::setCaps()
+void AMDGPU770Device::setCaps()
 {
-  if (mSTM->isOverride(AMDILDeviceInfo::DoubleOps)) {
-    mSWBits.set(AMDILDeviceInfo::FMA);
-    mHWBits.set(AMDILDeviceInfo::DoubleOps);
+  if (mSTM->isOverride(AMDGPUDeviceInfo::DoubleOps)) {
+    mSWBits.set(AMDGPUDeviceInfo::FMA);
+    mHWBits.set(AMDGPUDeviceInfo::DoubleOps);
   }
-  mSWBits.set(AMDILDeviceInfo::BarrierDetect);
-  mHWBits.reset(AMDILDeviceInfo::LongOps);
-  mSWBits.set(AMDILDeviceInfo::LongOps);
-  mSWBits.set(AMDILDeviceInfo::LocalMem);
+  mSWBits.set(AMDGPUDeviceInfo::BarrierDetect);
+  mHWBits.reset(AMDGPUDeviceInfo::LongOps);
+  mSWBits.set(AMDGPUDeviceInfo::LongOps);
+  mSWBits.set(AMDGPUDeviceInfo::LocalMem);
 }
 
-size_t AMDIL770Device::getWavefrontSize() const
+size_t AMDGPU770Device::getWavefrontSize() const
 {
-  return AMDILDevice::WavefrontSize;
+  return AMDGPUDevice::WavefrontSize;
 }
 
-AMDIL710Device::AMDIL710Device(AMDGPUSubtarget *ST) : AMDIL7XXDevice(ST)
+AMDGPU710Device::AMDGPU710Device(AMDGPUSubtarget *ST) : AMDGPU7XXDevice(ST)
 {
 }
 
-AMDIL710Device::~AMDIL710Device()
+AMDGPU710Device::~AMDGPU710Device()
 {
 }
 
-size_t AMDIL710Device::getWavefrontSize() const
+size_t AMDGPU710Device::getWavefrontSize() const
 {
-  return AMDILDevice::QuarterWavefrontSize;
+  return AMDGPUDevice::QuarterWavefrontSize;
 }