RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2024-11-23 11:29:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

gpu: remove unimplemented instructions earlier

Browse Source
This commit is contained in:
DH 2024-11-14 20:07:07 +03:00
parent 76cf146a32
commit ddad35e1ee
1 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
rpcsx/gpu/lib/gcn-shader/src/GcnConverter.cpp
View File

@ -1178,6 +1178,49 @@ static void instructionsToSpv(GcnConverter &converter, gcn::Import &importer,
inst == ir::amdgpu::SAMPLER || inst == ir::amdgpu::TBUFFER || inst == ir::amdgpu::SAMPLER || inst == ir::amdgpu::TBUFFER ||
inst == ir::amdgpu::IMAGE_BUFFER) { inst == ir::amdgpu::IMAGE_BUFFER) {
toAnalyze.push_back(inst.staticCast<ir::Value>()); toAnalyze.push_back(inst.staticCast<ir::Value>());
continue;
}
if (inst.getKind() != ir::Kind::Spv && inst.getKind() != ir::Kind::AmdGpu &&
semanticModuleInfo.findSemanticOf(inst.getInstId()) == nullptr) {
std::println(std::cerr, "unimplemented semantic: ");
inst.print(std::cerr, context.ns);
std::println(std::cerr);
std::vector<ir::Instruction> workList;
std::set<ir::Instruction> removed;
workList.push_back(inst);
auto builder = gcn::Builder::createInsertBefore(context, inst);
while (!workList.empty()) {
auto inst = workList.back();
workList.pop_back();
if (!removed.insert(inst).second) {
continue;
}
std::println(std::cerr, "removing ");
inst.print(std::cerr, context.ns);
std::println(std::cerr);
if (auto value = inst.cast<ir::Value>()) {
for (auto &use : value.getUseList()) {
if (removed.contains(use.user)) {
continue;
}
workList.push_back(use.user);
}
value.replaceAllUsesWith(builder.createSpvUndef(
inst.getLocation(), value.getOperand(0).getAsValue()));
}
inst.remove();
}
continue;
} }
} }
@ -1616,45 +1659,6 @@ static void instructionsToSpv(GcnConverter &converter, gcn::Import &importer,
auto function = semanticModuleInfo.findSemanticOf(inst.getInstId()); auto function = semanticModuleInfo.findSemanticOf(inst.getInstId());
if (function == nullptr) {
std::println(std::cerr, "unimplemented semantic: ");
inst.print(std::cerr, context.ns);
std::println(std::cerr);
std::vector<ir::Instruction> workList;
std::set<ir::Instruction> removed;
workList.push_back(inst);
while (!workList.empty()) {
auto inst = workList.back();
workList.pop_back();
if (!removed.insert(inst).second) {
continue;
}
std::println(std::cerr, "removing ");
inst.print(std::cerr, context.ns);
std::println(std::cerr);
if (auto value = inst.cast<ir::Value>()) {
for (auto &use : value.getUseList()) {
if (removed.contains(use.user)) {
continue;
}
workList.push_back(use.user);
}
value.replaceAllUsesWith(builder.createSpvUndef(
inst.getLocation(), value.getOperand(0).getAsValue()));
}
inst.remove();
}
continue;
}
function = ir::clone(function, context, importer); function = ir::clone(function, context, importer);
auto spvFnCall = builder.createSpvFunctionCall( auto spvFnCall = builder.createSpvFunctionCall(