mirrors/ZLUDA
0
0
Fork 0
mirror of https://github.com/vosen/ZLUDA.git synced 2025-07-30 12:58:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix PtrAdd

Browse source
This commit is contained in:
Andrzej Janik 2024-08-30 17:47:47 +02:00
commit 32b62626ff
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ptx/src/pass/expand_arguments.rs
View file

@ -63,7 +63,7 @@ impl<'a, 'b> FlattenArguments<'a, 'b> {
} else { } else {
return Err(TranslateError::UntypedSymbol); return Err(TranslateError::UntypedSymbol);
}; };
if state_space != ast::StateSpace::Reg && state_space != ast::StateSpace::Sreg { if state_space == ast::StateSpace::Reg || state_space == ast::StateSpace::Sreg {
let (reg_type, reg_space) = self.id_def.get_typed(reg)?; let (reg_type, reg_space) = self.id_def.get_typed(reg)?;
if !state_is_compatible(reg_space, ast::StateSpace::Reg) { if !state_is_compatible(reg_space, ast::StateSpace::Reg) {
return Err(error_mismatched_type()); return Err(error_mismatched_type());

16
ptx/src/pass/mod.rs
View file

@ -1,5 +1,6 @@
use ptx_parser as ast; use ptx_parser as ast;
use rspirv::{binary::Assemble, dr}; use rspirv::{binary::Assemble, dr};
use std::hash::Hash;
use std::{ use std::{
borrow::Cow, borrow::Cow,
cell::RefCell, cell::RefCell,
@ -10,11 +11,11 @@ use std::{
mem, mem,
rc::Rc, rc::Rc,
}; };
use std::hash::Hash;
mod convert_dynamic_shared_memory_usage; mod convert_dynamic_shared_memory_usage;
mod convert_to_stateful_memory_access; mod convert_to_stateful_memory_access;
mod convert_to_typed; mod convert_to_typed;
mod emit_spirv;
mod expand_arguments; mod expand_arguments;
mod extract_globals; mod extract_globals;
mod fix_special_registers; mod fix_special_registers;
@ -23,7 +24,6 @@ mod insert_mem_ssa_statements;
mod normalize_identifiers; mod normalize_identifiers;
mod normalize_labels; mod normalize_labels;
mod normalize_predicates; mod normalize_predicates;
mod emit_spirv;
static ZLUDA_PTX_IMPL_INTEL: &'static [u8] = include_bytes!("../../lib/zluda_ptx_impl.spv"); static ZLUDA_PTX_IMPL_INTEL: &'static [u8] = include_bytes!("../../lib/zluda_ptx_impl.spv");
static ZLUDA_PTX_IMPL_AMD: &'static [u8] = include_bytes!("../../lib/zluda_ptx_impl.bc"); static ZLUDA_PTX_IMPL_AMD: &'static [u8] = include_bytes!("../../lib/zluda_ptx_impl.bc");
@ -55,7 +55,8 @@ pub fn to_spirv_module<'input>(ast: ast::Module<'input>) -> Result<Module, Trans
})?; })?;
normalize_variable_decls(&mut directives); normalize_variable_decls(&mut directives);
let denorm_information = compute_denorm_information(&directives); let denorm_information = compute_denorm_information(&directives);
let (spirv, kernel_info, build_options) = emit_spirv::run(builder, &id_defs, call_map, denorm_information, directives)?; let (spirv, kernel_info, build_options) =
emit_spirv::run(builder, &id_defs, call_map, denorm_information, directives)?;
Ok(Module { Ok(Module {
spirv, spirv,
kernel_info, kernel_info,
@ -881,7 +882,10 @@ impl<T: ast::Operand<Ident = SpirvWord>> Statement<ast::Instruction<T>, T> {
)?; )?;
let offset_src = visitor.visit( let offset_src = visitor.visit(
offset_src, offset_src,
Some((&underlying_type, state_space)), Some((
&ast::Type::Scalar(ast::ScalarType::S64),
ast::StateSpace::Reg,
)),
false, false,
false, false,
)?; )?;
@ -1582,7 +1586,9 @@ fn flush_to_zero(this: &ast::Instruction<SpirvWord>) -> Option<(bool, u8)> {
} => float_control } => float_control
.flush_to_zero .flush_to_zero
.map(|ftz| (ftz, float_control.type_.size_of())), .map(|ftz| (ftz, float_control.type_.size_of())),
ast::Instruction::Fma { data, .. } => data.flush_to_zero.map(|ftz| (ftz, data.type_.size_of())), ast::Instruction::Fma { data, .. } => {
data.flush_to_zero.map(|ftz| (ftz, data.type_.size_of()))
}
ast::Instruction::Setp { data, .. } => { ast::Instruction::Setp { data, .. } => {
data.flush_to_zero.map(|ftz| (ftz, data.type_.size_of())) data.flush_to_zero.map(|ftz| (ftz, data.type_.size_of()))
} }