Skip to content

Added barrier to panic loop. #1055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Added barrier to panic loop. #1055

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da852b3
Added barrier to panic loop.
charles-r-earp Apr 26, 2023
cb280ab
Fixed typo.
charles-r-earp Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion crates/rustc_codegen_spirv/src/builder/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::abi::ConvSpirvType;
use crate::builder_spirv::{SpirvValue, SpirvValueExt};
use crate::codegen_cx::CodegenCx;
use crate::spirv_type::SpirvType;
use rspirv::spirv::GLOp;
use rspirv::spirv::{GLOp, MemoryModel};
use rustc_codegen_ssa::mir::operand::OperandRef;
use rustc_codegen_ssa::mir::place::PlaceRef;
use rustc_codegen_ssa::traits::{BuilderMethods, IntrinsicCallMethods};
Expand Down Expand Up @@ -345,6 +345,26 @@ impl<'a, 'tcx> IntrinsicCallMethods<'tcx> for Builder<'a, 'tcx> {
self.br(abort_loop_bb);

self.switch_to_block(abort_loop_bb);
{
// Add a barrier to ensure that the loop is not removed by spirv-opt AggressiveDCE
// https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#Scope_-id-
let invocation = 4;
// https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#Memory_Semantics_-id-
let relaxed = 0x0;
let release = 0x4;
let uniform_memory = 0x40;
let memory_model = self.cx.target.memory_model();
let memory = invocation;
let semantics = match memory_model {
MemoryModel::Simple | MemoryModel::GLSL450 | MemoryModel::OpenCL => relaxed,
MemoryModel::Vulkan => release | uniform_memory,
};
let mut builder = self.emit();
let uint = builder.type_int(32, 0);
let memory = builder.constant_u32(uint, memory);
let semantics = builder.constant_u32(uint, semantics);
builder.memory_barrier(memory, semantics).unwrap();
}
self.br(abort_loop_bb);

self.switch_to_block(abort_continue_bb);
Expand Down