P4 to Git Change 1203209 by yaxunl@yaxunl_stg_win50 on 2015/10/23 14:39:53
SWDEV-67990 - SPIR-V: Rename SPRV to SPIRV.
Affected files ...
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/frontend_clang.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#134 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#78 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/Support/SPIRV.h#5 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/CMakeLists.txt#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/OCL20To12.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/OCL20ToSPIRV.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/OCL20ToSPRV.cpp#2 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/OCL21ToSPIRV.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/OCL21ToSPRV.cpp#2 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/OCLUtil.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/OCLUtil.h#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPIRVInternal.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPIRVLowerBool.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPIRVLowerOCLBlocks.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPIRVReader.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPIRVToOCL20.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPIRVUtil.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPIRVWriter.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVInternal.h#25 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVLowerBool.cpp#2 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVLowerOCLBlocks.cpp#5 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVReader.cpp#35 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVToOCL20.cpp#6 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVUtil.cpp#29 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/SPRVWriter.cpp#35 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVBasicBlock.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVBasicBlock.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVDebug.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVDebug.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVDecorate.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVEntry.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVEntry.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVEnum.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVError.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVErrorEnum.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVExtInst.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVFunction.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVFunction.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVInstruction.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVInstruction.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVModule.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVModule.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVOpCode.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVOpCodeEnum.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVStream.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVStream.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVType.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVType.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVUtil.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVValue.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPIRVValue.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRV.h#2 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVBasicBlock.cpp#4 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVBasicBlock.h#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVDebug.cpp#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVDebug.h#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVDecorate.cpp#6 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVDecorate.h#5 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVEntry.cpp#11 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVEntry.h#17 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVEnum.h#14 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVError.h#2 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVErrorEnum.h#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVExtInst.h#5 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVFunction.cpp#6 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVFunction.h#6 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVInstruction.cpp#10 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVInstruction.h#27 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVModule.cpp#24 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVModule.h#16 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVOpCode.h#12 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVOpCodeEnum.h#7 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVStream.cpp#7 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVStream.h#8 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVType.cpp#8 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVType.h#12 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVUtil.h#11 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVValue.cpp#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/SPRVValue.h#13 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/SPIRV/libSPIRV/libSPIRV.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/tools/llvm-spirv/llvm-spirv.cpp#6 edit
[ROCm/clr commit: 02672aa999]
This commit is contained in:
@@ -199,7 +199,7 @@ int amdcl::ClangOCLFrontend::compileCommand(const std::string& src) {
|
||||
llvm::cl::ParseCommandLineOptions(Options()->getLLVMArgc(),
|
||||
Options()->getLLVMArgv(), "LLVM/SPIRV converter");
|
||||
}
|
||||
if (WriteSPRV(llvmbinary_, ss, err)) {
|
||||
if (WriteSPIRV(llvmbinary_, ss, err)) {
|
||||
std::string img = ss.str();
|
||||
CL()->clAPI.insSec(CL(), Elf(), img.data(), img.size(), aclSPIRV);
|
||||
}
|
||||
|
||||
@@ -506,8 +506,8 @@ translateSpirv(llvm::Module *&M, const std::string &DumpSpirv,
|
||||
const std::string &DumpLlvm){
|
||||
std::stringstream SS;
|
||||
std::string Err;
|
||||
if (!llvm::WriteSPRV(M, SS, Err)) {
|
||||
llvm::errs() << "Fails to save LLVM as SPRV: " << Err << '\n';
|
||||
if (!llvm::WriteSPIRV(M, SS, Err)) {
|
||||
llvm::errs() << "Fails to save LLVM as SPIR-V: " << Err << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -517,8 +517,8 @@ translateSpirv(llvm::Module *&M, const std::string &DumpSpirv,
|
||||
OFS.close();
|
||||
}
|
||||
|
||||
if (!llvm::ReadSPRV(M->getContext(), SS, M, Err)) {
|
||||
llvm::errs() << "Fails to load SPIRV as LLVM Module: " << Err << '\n';
|
||||
if (!llvm::ReadSPIRV(M->getContext(), SS, M, Err)) {
|
||||
llvm::errs() << "Fails to load SPIR-V as LLVM Module: " << Err << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -354,7 +354,7 @@ RSLLVMIRToModule(
|
||||
if (error != NULL) (*error) = ACL_FRONTEND_FAILURE;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
aclModule *module = reinterpret_cast<aclModule*>(M);
|
||||
return module;
|
||||
}
|
||||
@@ -419,7 +419,7 @@ SPIRVToModule(
|
||||
llvm::cl::ParseCommandLineOptions(opt->getLLVMArgc(), opt->getLLVMArgv(),
|
||||
"SPIRV/LLVM converter");
|
||||
}
|
||||
bool success = llvm::ReadSPRV(*llCtx, ss, llMod, errMsg);
|
||||
bool success = llvm::ReadSPIRV(*llCtx, ss, llMod, errMsg);
|
||||
|
||||
if (success && llMod && opt->isDumpFlagSet(amd::option::DUMP_BC_SPIRV)) {
|
||||
auto bcDump = opt->getDumpFileName("_fromspv.bc");
|
||||
@@ -485,7 +485,7 @@ LLVMToSPIRV(
|
||||
|
||||
std::string spvImg;
|
||||
std::stringstream ss(spvImg);
|
||||
bool success = llvm::WriteSPRV(llMod, ss, errMsg);
|
||||
bool success = llvm::WriteSPIRV(llMod, ss, errMsg);
|
||||
|
||||
if (opt->isDumpFlagSet(amd::option::DUMP_SPIRV)) {
|
||||
std::ofstream ofs(opt->getDumpFileName(".spv"), std::ios::binary);
|
||||
@@ -2335,13 +2335,13 @@ if_aclRemoveSymbol(aclCompiler *cl,
|
||||
return elfBin->removeSymbol(id, symbol) ? ACL_SUCCESS : ACL_ELF_ERROR;
|
||||
}
|
||||
|
||||
// Function performs deserialization of aclMetadata into *md
|
||||
// Function performs deserialization of aclMetadata into *md
|
||||
// instead of changing source .rodata section in memory pointed by *ptr.
|
||||
// Deserialization includes restoring of pointers, whereas
|
||||
// serialized .rodata has pointers set to NULL by serializeMetadata function.
|
||||
// We should leave serialized metaData unchanged (e.g. w/o garbage pointers)
|
||||
// due to obtain the same binary from one compilation to another.
|
||||
// Otherwise, OpenCL conformance "binary_create" test would fail on comparison
|
||||
// Otherwise, OpenCL conformance "binary_create" test would fail on comparison
|
||||
// of OpenCL "binaries" (bifs in our case).
|
||||
void deserializeCLMetadata(const char* ptr, aclMetadata * const md, const size_t size)
|
||||
{
|
||||
|
||||
مرجع در شماره جدید
Block a user