Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit 53297d0

Browse files
committed
SWDEV-241896 - Remove extern support in ROCclr/HIP since compiler added Texture Reference support.
Change-Id: I2cf27e13a53860fe11e9245c9cbdcb8bd88a7872
1 parent 30d1d9b commit 53297d0

File tree

3 files changed

+0
-90
lines changed

3 files changed

+0
-90
lines changed

device/devprogram.cpp

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ Program::Program(amd::Device& device, amd::Program& owner)
9898
Program::~Program() {
9999
clear();
100100

101-
/* Delete the undefined memory object */
102-
for (auto it = undef_mem_obj_.begin(); it != undef_mem_obj_.end(); ++it) {
103-
(*it)->release();
104-
}
105-
106101
if (isLC()) {
107102
#if defined(USE_COMGR_LIBRARY)
108103
for (auto const& kernelMeta : kernelMetadataMap_) {
@@ -2606,77 +2601,4 @@ bool Program::getGlobalVarFromCodeObj(std::vector<std::string>* var_names) const
26062601
return true;
26072602
#endif
26082603
}
2609-
2610-
bool Program::getUndefinedVarFromCodeObj(std::vector<std::string>* var_names) const {
2611-
#if defined(USE_COMGR_LIBRARY)
2612-
return getSymbolsFromCodeObj(var_names, AMD_COMGR_SYMBOL_TYPE_NOTYPE);
2613-
#else
2614-
return true;
2615-
#endif
2616-
}
2617-
2618-
bool Program::getUndefinedVarInfo(std::string var_name, void** var_addr, size_t* var_size) {
2619-
if (owner()->varcallback != nullptr) {
2620-
return owner()->varcallback(as_cl(owner()), var_name.c_str(), var_addr, var_size);
2621-
} else {
2622-
buildLog_ += "SVAR HIP Call back is not set \n";
2623-
return false;
2624-
}
2625-
}
2626-
2627-
bool Program::defineUndefinedVars() {
2628-
size_t address = 0;
2629-
size_t hsize = 0;
2630-
void* dptr = nullptr;
2631-
void* hptr = nullptr;
2632-
device::Memory* dev_mem = nullptr;
2633-
amd::Memory* amd_mem_obj = nullptr;
2634-
std::vector<std::string> var_names;
2635-
2636-
if (!getUndefinedVarFromCodeObj(&var_names)) {
2637-
DevLogError("Cannot get Undefined Var from Code Object \n");
2638-
return false;
2639-
}
2640-
2641-
for (auto it = var_names.begin(); it != var_names.end(); ++it) {
2642-
if (!getUndefinedVarInfo(*it, &hptr, &hsize)) {
2643-
continue;
2644-
}
2645-
2646-
amd_mem_obj = new (owner()->context()) amd::Buffer(const_cast<amd::Context&>(owner()->context()),
2647-
CL_MEM_USE_HOST_PTR, hsize);
2648-
if (amd_mem_obj == nullptr) {
2649-
LogError("[OCL] failed to create a mem object!");
2650-
return false;
2651-
}
2652-
2653-
if (!amd_mem_obj->create(hptr)) {
2654-
LogError("[OCL] failed to create a svm hidden buffer!");
2655-
amd_mem_obj->release();
2656-
return false;
2657-
}
2658-
2659-
undef_mem_obj_.push_back(amd_mem_obj);
2660-
2661-
dev_mem = amd_mem_obj->getDeviceMemory(device());
2662-
if (dev_mem == nullptr) {
2663-
LogError("[OCL] failed to create a mem object!");
2664-
return false;
2665-
}
2666-
2667-
dptr = reinterpret_cast<void*>(dev_mem->virtualAddress());
2668-
if (dev_mem == nullptr) {
2669-
LogError("[OCL] failed to create a mem object!");
2670-
return false;
2671-
}
2672-
2673-
if(!defineGlobalVar(it->c_str(), dptr)) {
2674-
LogError("[OCL] failed to define global var");
2675-
return false;
2676-
}
2677-
}
2678-
2679-
return true;
2680-
}
2681-
26822604
} /* namespace device*/

device/devprogram.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ class Program : public amd::HeapObject {
129129
std::map<std::string, amd_comgr_metadata_node_t> kernelMetadataMap_; //!< Map of kernel metadata
130130
#endif
131131

132-
std::vector<amd::Memory*> undef_mem_obj_;
133-
134132
public:
135133
//! Construct a section.
136134
Program(amd::Device& device, amd::Program& owner);
@@ -219,8 +217,6 @@ class Program : public amd::HeapObject {
219217
//! Global variables are a part of the code segment
220218
bool hasGlobalStores() const { return hasGlobalStores_; }
221219

222-
std::vector<amd::Memory*> getUndefMemObj() const { return undef_mem_obj_; }
223-
224220
#if defined(USE_COMGR_LIBRARY)
225221
amd_comgr_metadata_node_t metadata() const { return metadata_; }
226222

device/pal/palprogram.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,6 @@ bool HSAILProgram::setKernels(amd::option::Options* options, void* binary, size_
253253
hsa_code_object_t code_object;
254254
code_object.handle = reinterpret_cast<uint64_t>(binary);
255255

256-
if (amd::IS_HIP) {
257-
defineUndefinedVars();
258-
}
259-
260256
hsa_status_t status = executable_->LoadCodeObject(agent, code_object, nullptr);
261257
if (status != HSA_STATUS_SUCCESS) {
262258
buildLog_ += "Error: AMD HSA Code Object loading failed.\n";
@@ -751,10 +747,6 @@ bool LightningProgram::setKernels(amd::option::Options* options, void* binary, s
751747
hsa_code_object_t code_object;
752748
code_object.handle = reinterpret_cast<uint64_t>(binary);
753749

754-
if (amd::IS_HIP) {
755-
defineUndefinedVars();
756-
}
757-
758750
hsa_status_t status = executable_->LoadCodeObject(agent, code_object, nullptr);
759751
if (status != HSA_STATUS_SUCCESS) {
760752
buildLog_ += "Error: AMD HSA Code Object loading failed.\n";

0 commit comments

Comments
 (0)