mirrors/ZLUDA
1
0
Fork 0
mirror of https://github.com/vosen/ZLUDA.git synced 2025-04-20 08:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement shift left

Browse source
This commit is contained in:
Andrzej Janik 2020-08-01 01:09:57 +02:00
parent 8ee46c8fe1
commit ff449289eb
6 changed files with 108 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ptx/src/ast.rs
View file

@ -179,7 +179,7 @@ pub enum Instruction<P: ArgParams> {
Not(NotType, Arg2<P>),
Bra(BraData, Arg1<P>),
Cvt(CvtData, Arg2<P>),
Shl(ShlData, Arg3<P>),
Shl(ShlType, Arg3<P>),
St(StData, Arg2St<P>),
Ret(RetData),
}
@ -400,7 +400,12 @@ pub struct BraData {
pub struct CvtData {}
pub struct ShlData {}
#[derive(PartialEq, Eq, Copy, Clone)]
pub enum ShlType {
B16,
B32,
B64,
}
pub struct StData {
pub qualifier: LdStQualifier,

8
ptx/src/ptx.lalrpop
View file

@ -606,11 +606,13 @@ CvtType = {
// https://docs.nvidia.com/cuda/parallel-thread-execution/index.html#logic-and-shift-instructions-shl
InstShl: ast::Instruction<ast::ParsedArgParams<'input>> = {
"shl" ShlType <a:Arg3> => ast::Instruction::Shl(ast::ShlData{}, a)
"shl" <t:ShlType> <a:Arg3> => ast::Instruction::Shl(t, a)
};
ShlType = {
".b16", ".b32", ".b64"
ShlType: ast::ShlType = {
".b16" => ast::ShlType::B16,
".b32" => ast::ShlType::B32,
".b64" => ast::ShlType::B64,
};
// https://docs.nvidia.com/cuda/parallel-thread-execution/index.html#data-movement-and-conversion-instructions-st

1
ptx/src/test/spirv_run/mod.rs
View file

@ -47,6 +47,7 @@ test_ptx!(add, [1u64], [2u64]);
test_ptx!(setp, [10u64, 11u64], [1u64, 0u64]);
test_ptx!(bra, [10u64], [11u64]);
test_ptx!(not, [0u64], [u64::max_value()]);
test_ptx!(shl, [11u64], [44u64]);
struct DisplayError<T: Display + Debug> {
err: T,

22
ptx/src/test/spirv_run/shl.ptx Normal file
View file

@ -0,0 +1,22 @@
.version 6.5
.target sm_30
.address_size 64
.visible .entry shl(
.param .u64 input,
.param .u64 output
)
{
.reg .u64 in_addr;
.reg .u64 out_addr;
.reg .u64 temp;
.reg .u64 temp2;
ld.param.u64 in_addr, [input];
ld.param.u64 out_addr, [output];
ld.u64 temp, [in_addr];
shl.b64 temp2, temp, 2;
st.u64 [out_addr], temp2;
ret;
}

41
ptx/src/test/spirv_run/shl.spvtxt Normal file
View file

@ -0,0 +1,41 @@
OpCapability GenericPointer
OpCapability Linkage
OpCapability Addresses
OpCapability Kernel
OpCapability Int64
OpCapability Int8
%1 = OpExtInstImport "OpenCL.std"
OpMemoryModel Physical64 OpenCL
OpEntryPoint Kernel %5 "shl"
%void = OpTypeVoid
%ulong = OpTypeInt 64 0
%4 = OpTypeFunction %void %ulong %ulong
%_ptr_Function_ulong = OpTypePointer Function %ulong
%_ptr_Generic_ulong = OpTypePointer Generic %ulong
%ulong_0 = OpTypeInt 64 0
%uint = OpTypeInt 32 0
%uint_2 = OpConstant %uint 2
%5 = OpFunction %void None %4
%6 = OpFunctionParameter %ulong
%7 = OpFunctionParameter %ulong
%21 = OpLabel
%8 = OpVariable %_ptr_Function_ulong Function
%9 = OpVariable %_ptr_Function_ulong Function
%10 = OpVariable %_ptr_Function_ulong Function
%11 = OpVariable %_ptr_Function_ulong Function
OpStore %8 %6
OpStore %9 %7
%13 = OpLoad %ulong %8
%19 = OpConvertUToPtr %_ptr_Generic_ulong %13
%12 = OpLoad %ulong %19
OpStore %10 %12
%15 = OpLoad %ulong_0 %10
%14 = OpShiftLeftLogical %ulong_0 %15 %uint_2
OpStore %11 %14
%16 = OpLoad %ulong %9
%17 = OpLoad %ulong %11
%20 = OpConvertUToPtr %_ptr_Generic_ulong %16
OpStore %20 %17
OpReturn
OpFunctionEnd

36
ptx/src/translate.rs
View file

@ -668,6 +668,10 @@ fn emit_function_body_ops(
_ => builder.not(result_type, result_id, operand),
}?;
}
ast::Instruction::Shl(t, a) => {
let result_type = map.get_or_add(builder, SpirvType::from(t.to_type()));
builder.shift_left_logical(result_type, Some(a.dst), a.src1, a.src2)?;
}
_ => todo!(),
},
Statement::LoadVar(arg, typ) => {
@ -1121,11 +1125,11 @@ impl<T: ast::ArgParams> ast::Instruction<T> {
}
ast::Instruction::Mul(d, a) => {
let inst_type = d.get_type();
ast::Instruction::Mul(d, a.map(visitor, Some(inst_type)))
ast::Instruction::Mul(d, a.map_non_shift(visitor, Some(inst_type)))
}
ast::Instruction::Add(d, a) => {
let inst_type = d.get_type();
ast::Instruction::Add(d, a.map(visitor, Some(inst_type)))
ast::Instruction::Add(d, a.map_non_shift(visitor, Some(inst_type)))
}
ast::Instruction::Setp(d, a) => {
let inst_type = d.typ;
@ -1139,7 +1143,9 @@ impl<T: ast::ArgParams> ast::Instruction<T> {
ast::Instruction::Not(t, a.map(visitor, Some(t.to_type())))
}
ast::Instruction::Cvt(_, _) => todo!(),
ast::Instruction::Shl(_, _) => todo!(),
ast::Instruction::Shl(t, a) => {
ast::Instruction::Shl(t, a.map_shift(visitor, Some(t.to_type())))
}
ast::Instruction::St(d, a) => {
let inst_type = d.typ;
ast::Instruction::St(d, a.map(visitor, Some(ast::Type::Scalar(inst_type))))
@ -1365,7 +1371,7 @@ impl<T: ast::ArgParams> ast::Arg2Mov<T> {
}
impl<T: ast::ArgParams> ast::Arg3<T> {
fn map<U: ast::ArgParams, V: ArgumentMapVisitor<T, U>>(
fn map_non_shift<U: ast::ArgParams, V: ArgumentMapVisitor<T, U>>(
self,
visitor: &mut V,
t: Option<ast::Type>,
@ -1376,6 +1382,18 @@ impl<T: ast::ArgParams> ast::Arg3<T> {
src2: visitor.src_operand(self.src2, t),
}
}
fn map_shift<U: ast::ArgParams, V: ArgumentMapVisitor<T, U>>(
self,
visitor: &mut V,
t: Option<ast::Type>,
) -> ast::Arg3<U> {
ast::Arg3 {
dst: visitor.dst_variable(self.dst, t),
src1: visitor.src_operand(self.src1, t),
src2: visitor.src_operand(self.src2, Some(ast::Type::Scalar(ast::ScalarType::U32))),
}
}
}
impl<T: ast::ArgParams> ast::Arg4<T> {
@ -1533,6 +1551,16 @@ impl ast::NotType {
}
}
impl ast::ShlType {
fn to_type(self) -> ast::Type {
match self {
ast::ShlType::B16 => ast::Type::Scalar(ast::ScalarType::B16),
ast::ShlType::B32 => ast::Type::Scalar(ast::ScalarType::B32),
ast::ShlType::B64 => ast::Type::Scalar(ast::ScalarType::B64),
}
}
}
impl ast::AddDetails {
fn get_type(&self) -> ast::Type {
match self {