P4 to Git Change 1294021 by lmoriche@lmoriche_opencl_dev on 2016/07/21 12:28:39
SWDEV-94640 - Back out CL#1293210:
[OCL-LC-ROCm] OpenCL Runtime Library Implements OpenCL runtime API. Add HSA virtual device to ORCA.
- Rename hsa_foundation to ROCm.
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/Makefile#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/wNow64a/Makefile#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/mesa_glinterop.h#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocappprofile.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocappprofile.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocbinary.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompilerlib.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompilerlib.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdefs.hpp#3 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#3 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocglinterop.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocglinterop.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprintf.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprintf.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocregisters.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.hpp#2 delete
[ROCm/clr commit: 355257ed71]
This commit is contained in:
@@ -1,61 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2009 Advanced Micro Devices, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
|
||||
#ifndef WITHOUT_HSA_BACKEND
|
||||
|
||||
#include "top.hpp"
|
||||
#include "device/device.hpp"
|
||||
#include "device/appprofile.hpp"
|
||||
#include "device/rocm/rocappprofile.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
amd::AppProfile* rocCreateAppProfile()
|
||||
{
|
||||
amd::AppProfile* appProfile = new roc::AppProfile;
|
||||
|
||||
if ((appProfile == NULL) || !appProfile->init()) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return appProfile;
|
||||
}
|
||||
|
||||
namespace roc {
|
||||
|
||||
bool AppProfile::ParseApplicationProfile()
|
||||
{
|
||||
std::string appName("Explorer");
|
||||
|
||||
std::transform(appName.begin(), appName.end(), appName.begin(), ::tolower);
|
||||
std::transform(appFileName_.begin(), appFileName_.end(), appFileName_.begin(), ::tolower);
|
||||
|
||||
if (appFileName_.compare(appName) == 0 ) {
|
||||
hsaDeviceHint_ = CL_HSA_DISABLED_AMD;
|
||||
gpuvmHighAddr_ = false;
|
||||
noHsaInit_ = true;
|
||||
profileOverridesAllSettings_ = true;
|
||||
}
|
||||
|
||||
// Setting both bits is invalid, make it niether.
|
||||
if (hsaDeviceHint_ & CL_HSA_ENABLED_AMD
|
||||
&& hsaDeviceHint_ & CL_HSA_DISABLED_AMD) {
|
||||
hsaDeviceHint_ = 0;
|
||||
}
|
||||
|
||||
if (noHsaInit_) {
|
||||
// If no HSA initialization, then force hint flag to non-HSA device.
|
||||
// Even if this is not forced, the device selection logic will endure it.
|
||||
// After all hint flags are treated as hint only - depending on
|
||||
// availibility.
|
||||
hsaDeviceHint_ = CL_HSA_DISABLED_AMD;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user