Index: llvm/trunk/lib/Target/AMDGPU/CIInstructions.td =================================================================== --- llvm/trunk/lib/Target/AMDGPU/CIInstructions.td +++ llvm/trunk/lib/Target/AMDGPU/CIInstructions.td @@ -13,15 +13,6 @@ // S_CBRANCH_CDBGSYS // S_CBRANCH_CDBGSYS_OR_USER // S_CBRANCH_CDBGSYS_AND_USER -// DS_NOP -// DS_GWS_SEMA_RELEASE_ALL -// DS_WRAP_RTN_B32 -// DS_CNDXCHG32_RTN_B64 -// DS_WRITE_B96 -// DS_WRITE_B128 -// DS_CONDXCHG32_RTN_B128 -// DS_READ_B96 -// DS_READ_B128 // BUFFER_LOAD_DWORDX3 // BUFFER_STORE_DWORDX3 @@ -82,14 +73,6 @@ //===----------------------------------------------------------------------===// -// DS Instructions -//===----------------------------------------------------------------------===// -defm DS_WRAP_RTN_F32 : DS_1A1D_RET <0x34, "ds_wrap_rtn_f32", VGPR_32, "ds_wrap_f32">; - -// DS_CONDXCHG32_RTN_B64 -// DS_CONDXCHG32_RTN_B128 - -//===----------------------------------------------------------------------===// // SMRD Instructions //===----------------------------------------------------------------------===// Index: llvm/trunk/lib/Target/AMDGPU/DSInstructions.td =================================================================== --- llvm/trunk/lib/Target/AMDGPU/DSInstructions.td +++ llvm/trunk/lib/Target/AMDGPU/DSInstructions.td @@ -0,0 +1,894 @@ +//===-- DSInstructions.td - DS Instruction Defintions ---------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +class DS_Pseudo pattern=[]> : + InstSI , + SIMCInstr { + + let SubtargetPredicate = isGCN; + + let LGKM_CNT = 1; + let DS = 1; + let UseNamedOperandTable = 1; + let Uses = [M0, EXEC]; + + // Most instruction load and store data, so set this as the default. + let mayLoad = 1; + let mayStore = 1; + + let hasSideEffects = 0; + let SchedRW = [WriteLDS]; + + let isPseudo = 1; + let isCodeGenOnly = 1; + + let AsmMatchConverter = "cvtDS"; + + string Mnemonic = opName; + string AsmOperands = asmOps; + + // Well these bits a kind of hack because it would be more natural + // to test "outs" and "ins" dags for the presence of particular operands + bits<1> has_vdst = 1; + bits<1> has_addr = 1; + bits<1> has_data0 = 1; + bits<1> has_data1 = 1; + + bits<1> has_offset = 1; // has "offset" that should be split to offset0,1 + bits<1> has_offset0 = 1; + bits<1> has_offset1 = 1; + + bits<1> has_gds = 1; + bits<1> gdsValue = 0; // if has_gds == 0 set gds to this value +} + +class DS_Real : + InstSI , + Enc64 { + + let isPseudo = 0; + let isCodeGenOnly = 0; + + // copy relevant pseudo op flags + let SubtargetPredicate = ds.SubtargetPredicate; + let AsmMatchConverter = ds.AsmMatchConverter; + + // encoding fields + bits<8> vdst; + bits<1> gds; + bits<8> addr; + bits<8> data0; + bits<8> data1; + bits<8> offset0; + bits<8> offset1; + + bits<16> offset; + let offset0 = !if(ds.has_offset, offset{7-0}, ?); + let offset1 = !if(ds.has_offset, offset{15-8}, ?); +} + + +// DS Pseudo instructions + +class DS_1A1D_NORET +: DS_Pseudo, + AtomicNoRet { + + let has_data1 = 0; + let has_vdst = 0; +} + +class DS_1A_Off8_NORET : DS_Pseudo { + + let has_data0 = 0; + let has_data1 = 0; + let has_vdst = 0; + let has_offset = 0; + let AsmMatchConverter = "cvtDSOffset01"; +} + +class DS_1A2D_NORET +: DS_Pseudo, + AtomicNoRet { + + let has_vdst = 0; +} + +class DS_1A2D_Off8_NORET +: DS_Pseudo { + + let has_vdst = 0; + let has_offset = 0; + let AsmMatchConverter = "cvtDSOffset01"; +} + +class DS_1A1D_RET +: DS_Pseudo { + + let hasPostISelHook = 1; + let has_data1 = 0; +} + +class DS_1A2D_RET +: DS_Pseudo { + + let hasPostISelHook = 1; +} + +class DS_1A_RET +: DS_Pseudo { + + let has_data0 = 0; + let has_data1 = 0; +} + +class DS_1A_Off8_RET +: DS_Pseudo { + + let has_offset = 0; + let has_data0 = 0; + let has_data1 = 0; + let AsmMatchConverter = "cvtDSOffset01"; +} + +class DS_1A_RET_GDS : DS_Pseudo { + + let has_data0 = 0; + let has_data1 = 0; + let has_gds = 0; + let gdsValue = 1; +} + +class DS_0A_RET : DS_Pseudo { + + let mayLoad = 1; + let mayStore = 1; + + let has_addr = 0; + let has_data0 = 0; + let has_data1 = 0; +} + +class DS_1A : DS_Pseudo { + + let mayLoad = 1; + let mayStore = 1; + + let has_vdst = 0; + let has_data0 = 0; + let has_data1 = 0; +} + +class DS_1A_GDS : DS_Pseudo { + + let has_vdst = 0; + let has_data0 = 0; + let has_data1 = 0; + let has_offset = 0; + let has_offset0 = 0; + let has_offset1 = 0; + + let has_gds = 0; + let gdsValue = 1; +} + +class DS_1A1D_PERMUTE +: DS_Pseudo { + + let mayLoad = 0; + let mayStore = 0; + let isConvergent = 1; + + let has_data1 = 0; + let has_gds = 0; +} + +def DS_ADD_U32 : DS_1A1D_NORET<"ds_add_u32">; +def DS_SUB_U32 : DS_1A1D_NORET<"ds_sub_u32">; +def DS_RSUB_U32 : DS_1A1D_NORET<"ds_rsub_u32">; +def DS_INC_U32 : DS_1A1D_NORET<"ds_inc_u32">; +def DS_DEC_U32 : DS_1A1D_NORET<"ds_dec_u32">; +def DS_MIN_I32 : DS_1A1D_NORET<"ds_min_i32">; +def DS_MAX_I32 : DS_1A1D_NORET<"ds_max_i32">; +def DS_MIN_U32 : DS_1A1D_NORET<"ds_min_u32">; +def DS_MAX_U32 : DS_1A1D_NORET<"ds_max_u32">; +def DS_AND_B32 : DS_1A1D_NORET<"ds_and_b32">; +def DS_OR_B32 : DS_1A1D_NORET<"ds_or_b32">; +def DS_XOR_B32 : DS_1A1D_NORET<"ds_xor_b32">; + +let mayLoad = 0 in { +def DS_WRITE_B8 : DS_1A1D_NORET<"ds_write_b8">; +def DS_WRITE_B16 : DS_1A1D_NORET<"ds_write_b16">; +def DS_WRITE_B32 : DS_1A1D_NORET<"ds_write_b32">; +def DS_WRITE2_B32 : DS_1A2D_Off8_NORET<"ds_write2_b32">; +def DS_WRITE2ST64_B32 : DS_1A2D_Off8_NORET<"ds_write2st64_b32">; +} + +def DS_MSKOR_B32 : DS_1A2D_NORET<"ds_mskor_b32">; +def DS_CMPST_B32 : DS_1A2D_NORET<"ds_cmpst_b32">; +def DS_CMPST_F32 : DS_1A2D_NORET<"ds_cmpst_f32">; +def DS_MIN_F32 : DS_1A2D_NORET<"ds_min_f32">; +def DS_MAX_F32 : DS_1A2D_NORET<"ds_max_f32">; + +def DS_ADD_U64 : DS_1A1D_NORET<"ds_add_u64", VReg_64>; +def DS_SUB_U64 : DS_1A1D_NORET<"ds_sub_u64", VReg_64>; +def DS_RSUB_U64 : DS_1A1D_NORET<"ds_rsub_u64", VReg_64>; +def DS_INC_U64 : DS_1A1D_NORET<"ds_inc_u64", VReg_64>; +def DS_DEC_U64 : DS_1A1D_NORET<"ds_dec_u64", VReg_64>; +def DS_MIN_I64 : DS_1A1D_NORET<"ds_min_i64", VReg_64>; +def DS_MAX_I64 : DS_1A1D_NORET<"ds_max_i64", VReg_64>; +def DS_MIN_U64 : DS_1A1D_NORET<"ds_min_u64", VReg_64>; +def DS_MAX_U64 : DS_1A1D_NORET<"ds_max_u64", VReg_64>; +def DS_AND_B64 : DS_1A1D_NORET<"ds_and_b64", VReg_64>; +def DS_OR_B64 : DS_1A1D_NORET<"ds_or_b64", VReg_64>; +def DS_XOR_B64 : DS_1A1D_NORET<"ds_xor_b64", VReg_64>; +def DS_MSKOR_B64 : DS_1A2D_NORET<"ds_mskor_b64", VReg_64>; +let mayLoad = 0 in { +def DS_WRITE_B64 : DS_1A1D_NORET<"ds_write_b64", VReg_64>; +def DS_WRITE2_B64 : DS_1A2D_Off8_NORET<"ds_write2_b64", VReg_64>; +def DS_WRITE2ST64_B64 : DS_1A2D_Off8_NORET<"ds_write2st64_b64", VReg_64>; +} +def DS_CMPST_B64 : DS_1A2D_NORET<"ds_cmpst_b64", VReg_64>; +def DS_CMPST_F64 : DS_1A2D_NORET<"ds_cmpst_f64", VReg_64>; +def DS_MIN_F64 : DS_1A1D_NORET<"ds_min_f64", VReg_64>; +def DS_MAX_F64 : DS_1A1D_NORET<"ds_max_f64", VReg_64>; + +def DS_ADD_RTN_U32 : DS_1A1D_RET<"ds_add_rtn_u32">, + AtomicNoRet<"ds_add_u32", 1>; +def DS_SUB_RTN_U32 : DS_1A1D_RET<"ds_sub_rtn_u32">, + AtomicNoRet<"ds_sub_u32", 1>; +def DS_RSUB_RTN_U32 : DS_1A1D_RET<"ds_rsub_rtn_u32">, + AtomicNoRet<"ds_rsub_u32", 1>; +def DS_INC_RTN_U32 : DS_1A1D_RET<"ds_inc_rtn_u32">, + AtomicNoRet<"ds_inc_u32", 1>; +def DS_DEC_RTN_U32 : DS_1A1D_RET<"ds_dec_rtn_u32">, + AtomicNoRet<"ds_dec_u32", 1>; +def DS_MIN_RTN_I32 : DS_1A1D_RET<"ds_min_rtn_i32">, + AtomicNoRet<"ds_min_i32", 1>; +def DS_MAX_RTN_I32 : DS_1A1D_RET<"ds_max_rtn_i32">, + AtomicNoRet<"ds_max_i32", 1>; +def DS_MIN_RTN_U32 : DS_1A1D_RET<"ds_min_rtn_u32">, + AtomicNoRet<"ds_min_u32", 1>; +def DS_MAX_RTN_U32 : DS_1A1D_RET<"ds_max_rtn_u32">, + AtomicNoRet<"ds_max_u32", 1>; +def DS_AND_RTN_B32 : DS_1A1D_RET<"ds_and_rtn_b32">, + AtomicNoRet<"ds_and_b32", 1>; +def DS_OR_RTN_B32 : DS_1A1D_RET<"ds_or_rtn_b32">, + AtomicNoRet<"ds_or_b32", 1>; +def DS_XOR_RTN_B32 : DS_1A1D_RET<"ds_xor_rtn_b32">, + AtomicNoRet<"ds_xor_b32", 1>; +def DS_MSKOR_RTN_B32 : DS_1A2D_RET<"ds_mskor_rtn_b32">, + AtomicNoRet<"ds_mskor_b32", 1>; +def DS_CMPST_RTN_B32 : DS_1A2D_RET <"ds_cmpst_rtn_b32">, + AtomicNoRet<"ds_cmpst_b32", 1>; +def DS_CMPST_RTN_F32 : DS_1A2D_RET <"ds_cmpst_rtn_f32">, + AtomicNoRet<"ds_cmpst_f32", 1>; +def DS_MIN_RTN_F32 : DS_1A2D_RET <"ds_min_rtn_f32">, + AtomicNoRet<"ds_min_f32", 1>; +def DS_MAX_RTN_F32 : DS_1A2D_RET <"ds_max_rtn_f32">, + AtomicNoRet<"ds_max_f32", 1>; + +def DS_WRXCHG_RTN_B32 : DS_1A1D_RET<"ds_wrxchg_rtn_b32">, + AtomicNoRet<"", 1>; +def DS_WRXCHG2_RTN_B32 : DS_1A2D_RET<"ds_wrxchg2_rtn_b32", VReg_64, VGPR_32>, + AtomicNoRet<"", 1>; +def DS_WRXCHG2ST64_RTN_B32 : DS_1A2D_RET<"ds_wrxchg2st64_rtn_b32", VReg_64, VGPR_32>, + AtomicNoRet<"", 1>; + +def DS_ADD_RTN_U64 : DS_1A1D_RET<"ds_add_rtn_u64", VReg_64>, + AtomicNoRet<"ds_add_u64", 1>; +def DS_SUB_RTN_U64 : DS_1A1D_RET<"ds_sub_rtn_u64", VReg_64>, + AtomicNoRet<"ds_sub_u64", 1>; +def DS_RSUB_RTN_U64 : DS_1A1D_RET<"ds_rsub_rtn_u64", VReg_64>, + AtomicNoRet<"ds_rsub_u64", 1>; +def DS_INC_RTN_U64 : DS_1A1D_RET<"ds_inc_rtn_u64", VReg_64>, + AtomicNoRet<"ds_inc_u64", 1>; +def DS_DEC_RTN_U64 : DS_1A1D_RET<"ds_dec_rtn_u64", VReg_64>, + AtomicNoRet<"ds_dec_u64", 1>; +def DS_MIN_RTN_I64 : DS_1A1D_RET<"ds_min_rtn_i64", VReg_64>, + AtomicNoRet<"ds_min_i64", 1>; +def DS_MAX_RTN_I64 : DS_1A1D_RET<"ds_max_rtn_i64", VReg_64>, + AtomicNoRet<"ds_max_i64", 1>; +def DS_MIN_RTN_U64 : DS_1A1D_RET<"ds_min_rtn_u64", VReg_64>, + AtomicNoRet<"ds_min_u64", 1>; +def DS_MAX_RTN_U64 : DS_1A1D_RET<"ds_max_rtn_u64", VReg_64>, + AtomicNoRet<"ds_max_u64", 1>; +def DS_AND_RTN_B64 : DS_1A1D_RET<"ds_and_rtn_b64", VReg_64>, + AtomicNoRet<"ds_and_b64", 1>; +def DS_OR_RTN_B64 : DS_1A1D_RET<"ds_or_rtn_b64", VReg_64>, + AtomicNoRet<"ds_or_b64", 1>; +def DS_XOR_RTN_B64 : DS_1A1D_RET<"ds_xor_rtn_b64", VReg_64>, + AtomicNoRet<"ds_xor_b64", 1>; +def DS_MSKOR_RTN_B64 : DS_1A2D_RET<"ds_mskor_rtn_b64", VReg_64>, + AtomicNoRet<"ds_mskor_b64", 1>; +def DS_CMPST_RTN_B64 : DS_1A2D_RET<"ds_cmpst_rtn_b64", VReg_64>, + AtomicNoRet<"ds_cmpst_b64", 1>; +def DS_CMPST_RTN_F64 : DS_1A2D_RET<"ds_cmpst_rtn_f64", VReg_64>, + AtomicNoRet<"ds_cmpst_f64", 1>; +def DS_MIN_RTN_F64 : DS_1A1D_RET<"ds_min_rtn_f64", VReg_64>, + AtomicNoRet<"ds_min_f64", 1>; +def DS_MAX_RTN_F64 : DS_1A1D_RET<"ds_max_rtn_f64", VReg_64>, + AtomicNoRet<"ds_max_f64", 1>; + +def DS_WRXCHG_RTN_B64 : DS_1A1D_RET<"ds_wrxchg_rtn_b64", VReg_64>, + AtomicNoRet<"ds_wrxchg_b64", 1>; +def DS_WRXCHG2_RTN_B64 : DS_1A2D_RET<"ds_wrxchg2_rtn_b64", VReg_128, VReg_64>, + AtomicNoRet<"ds_wrxchg2_b64", 1>; +def DS_WRXCHG2ST64_RTN_B64 : DS_1A2D_RET<"ds_wrxchg2st64_rtn_b64", VReg_128, VReg_64>, + AtomicNoRet<"ds_wrxchg2st64_b64", 1>; + +def DS_GWS_INIT : DS_1A_GDS<"ds_gws_init">; +def DS_GWS_SEMA_V : DS_1A_GDS<"ds_gws_sema_v">; +def DS_GWS_SEMA_BR : DS_1A_GDS<"ds_gws_sema_br">; +def DS_GWS_SEMA_P : DS_1A_GDS<"ds_gws_sema_p">; +def DS_GWS_BARRIER : DS_1A_GDS<"ds_gws_barrier">; + +def DS_ADD_SRC2_U32 : DS_1A<"ds_add_src2_u32">; +def DS_SUB_SRC2_U32 : DS_1A<"ds_sub_src2_u32">; +def DS_RSUB_SRC2_U32 : DS_1A<"ds_rsub_src2_u32">; +def DS_INC_SRC2_U32 : DS_1A<"ds_inc_src2_u32">; +def DS_DEC_SRC2_U32 : DS_1A<"ds_dec_src2_u32">; +def DS_MIN_SRC2_I32 : DS_1A<"ds_min_src2_i32">; +def DS_MAX_SRC2_I32 : DS_1A<"ds_max_src2_i32">; +def DS_MIN_SRC2_U32 : DS_1A<"ds_min_src2_u32">; +def DS_MAX_SRC2_U32 : DS_1A<"ds_max_src2_u32">; +def DS_AND_SRC2_B32 : DS_1A<"ds_and_src_b32">; +def DS_OR_SRC2_B32 : DS_1A<"ds_or_src2_b32">; +def DS_XOR_SRC2_B32 : DS_1A<"ds_xor_src2_b32">; +def DS_MIN_SRC2_F32 : DS_1A<"ds_min_src2_f32">; +def DS_MAX_SRC2_F32 : DS_1A<"ds_max_src2_f32">; + +def DS_ADD_SRC2_U64 : DS_1A<"ds_add_src2_u64">; +def DS_SUB_SRC2_U64 : DS_1A<"ds_sub_src2_u64">; +def DS_RSUB_SRC2_U64 : DS_1A<"ds_rsub_src2_u64">; +def DS_INC_SRC2_U64 : DS_1A<"ds_inc_src2_u64">; +def DS_DEC_SRC2_U64 : DS_1A<"ds_dec_src2_u64">; +def DS_MIN_SRC2_I64 : DS_1A<"ds_min_src2_i64">; +def DS_MAX_SRC2_I64 : DS_1A<"ds_max_src2_i64">; +def DS_MIN_SRC2_U64 : DS_1A<"ds_min_src2_u64">; +def DS_MAX_SRC2_U64 : DS_1A<"ds_max_src2_u64">; +def DS_AND_SRC2_B64 : DS_1A<"ds_and_src2_b64">; +def DS_OR_SRC2_B64 : DS_1A<"ds_or_src2_b64">; +def DS_XOR_SRC2_B64 : DS_1A<"ds_xor_src2_b64">; +def DS_MIN_SRC2_F64 : DS_1A<"ds_min_src2_f64">; +def DS_MAX_SRC2_F64 : DS_1A<"ds_max_src2_f64">; + +def DS_WRITE_SRC2_B32 : DS_1A_Off8_NORET<"ds_write_src2_b32">; +def DS_WRITE_SRC2_B64 : DS_1A_Off8_NORET<"ds_write_src2_b64">; + +let Uses = [EXEC], mayLoad = 0, mayStore = 0, isConvergent = 1 in { +def DS_SWIZZLE_B32 : DS_1A_RET <"ds_swizzle_b32">; +} + +let mayStore = 0 in { +def DS_READ_I8 : DS_1A_RET<"ds_read_i8">; +def DS_READ_U8 : DS_1A_RET<"ds_read_u8">; +def DS_READ_I16 : DS_1A_RET<"ds_read_i16">; +def DS_READ_U16 : DS_1A_RET<"ds_read_u16">; +def DS_READ_B32 : DS_1A_RET<"ds_read_b32">; +def DS_READ_B64 : DS_1A_RET<"ds_read_b64", VReg_64>; + +def DS_READ2_B32 : DS_1A_Off8_RET<"ds_read2_b32", VReg_64>; +def DS_READ2ST64_B32 : DS_1A_Off8_RET<"ds_read2st64_b32", VReg_64>; + +def DS_READ2_B64 : DS_1A_Off8_RET<"ds_read2_b64", VReg_128>; +def DS_READ2ST64_B64 : DS_1A_Off8_RET<"ds_read2st64_b64", VReg_128>; +} + +let SubtargetPredicate = isSICI in { +def DS_CONSUME : DS_0A_RET<"ds_consume">; +def DS_APPEND : DS_0A_RET<"ds_append">; +def DS_ORDERED_COUNT : DS_1A_RET_GDS<"ds_ordered_count">; +} + +//===----------------------------------------------------------------------===// +// Instruction definitions for CI and newer. +//===----------------------------------------------------------------------===// +// Remaining instructions: +// DS_NOP +// DS_GWS_SEMA_RELEASE_ALL +// DS_WRAP_RTN_B32 +// DS_CNDXCHG32_RTN_B64 +// DS_WRITE_B96 +// DS_WRITE_B128 +// DS_CONDXCHG32_RTN_B128 +// DS_READ_B96 +// DS_READ_B128 + +let SubtargetPredicate = isCIVI in { + +def DS_WRAP_RTN_F32 : DS_1A1D_RET <"ds_wrap_rtn_f32">, + AtomicNoRet<"ds_wrap_f32", 1>; + +} // let SubtargetPredicate = isCIVI + +//===----------------------------------------------------------------------===// +// Instruction definitions for VI and newer. +//===----------------------------------------------------------------------===// + +let SubtargetPredicate = isVI in { + +let Uses = [EXEC] in { +def DS_PERMUTE_B32 : DS_1A1D_PERMUTE <"ds_permute_b32", + int_amdgcn_ds_permute>; +def DS_BPERMUTE_B32 : DS_1A1D_PERMUTE <"ds_bpermute_b32", + int_amdgcn_ds_bpermute>; +} + +} // let SubtargetPredicate = isVI + +//===----------------------------------------------------------------------===// +// DS Patterns +//===----------------------------------------------------------------------===// + +let Predicates = [isGCN] in { + +def : Pat < + (int_amdgcn_ds_swizzle i32:$src, imm:$offset16), + (DS_SWIZZLE_B32 $src, (as_i16imm $offset16), (i1 0)) +>; + +class DSReadPat : Pat < + (vt (frag (DS1Addr1Offset i32:$ptr, i32:$offset))), + (inst $ptr, (as_i16imm $offset), (i1 0)) +>; + +def : DSReadPat ; +def : DSReadPat ; +def : DSReadPat ; +def : DSReadPat ; +def : DSReadPat ; + +let AddedComplexity = 100 in { + +def : DSReadPat ; + +} // End AddedComplexity = 100 + +def : Pat < + (v2i32 (si_load_local (DS64Bit4ByteAligned i32:$ptr, i8:$offset0, + i8:$offset1))), + (DS_READ2_B32 $ptr, $offset0, $offset1, (i1 0)) +>; + +class DSWritePat : Pat < + (frag vt:$value, (DS1Addr1Offset i32:$ptr, i32:$offset)), + (inst $ptr, $value, (as_i16imm $offset), (i1 0)) +>; + +def : DSWritePat ; +def : DSWritePat ; +def : DSWritePat ; + +let AddedComplexity = 100 in { + +def : DSWritePat ; +} // End AddedComplexity = 100 + +def : Pat < + (si_store_local v2i32:$value, (DS64Bit4ByteAligned i32:$ptr, i8:$offset0, + i8:$offset1)), + (DS_WRITE2_B32 $ptr, (EXTRACT_SUBREG $value, sub0), + (EXTRACT_SUBREG $value, sub1), $offset0, $offset1, + (i1 0)) +>; + +class DSAtomicRetPat : Pat < + (frag (DS1Addr1Offset i32:$ptr, i32:$offset), vt:$value), + (inst $ptr, $value, (as_i16imm $offset), (i1 0)) +>; + +class DSAtomicCmpXChg : Pat < + (frag (DS1Addr1Offset i32:$ptr, i32:$offset), vt:$cmp, vt:$swap), + (inst $ptr, $cmp, $swap, (as_i16imm $offset), (i1 0)) +>; + + +// 32-bit atomics. +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicCmpXChg; + +// 64-bit atomics. +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; +def : DSAtomicRetPat; + +def : DSAtomicCmpXChg; + +} // let Predicates = [isGCN] + +//===----------------------------------------------------------------------===// +// Real instructions +//===----------------------------------------------------------------------===// + +//===----------------------------------------------------------------------===// +// SIInstructions.td +//===----------------------------------------------------------------------===// + +class DS_Real_si op, DS_Pseudo ds> : + DS_Real , + SIMCInstr { + let AssemblerPredicates=[isSICI]; + let DecoderNamespace="SICI"; + + // encoding + let Inst{7-0} = !if(ds.has_offset0, offset0, 0); + let Inst{15-8} = !if(ds.has_offset1, offset1, 0); + let Inst{17} = !if(ds.has_gds, gds, ds.gdsValue); + let Inst{25-18} = op; + let Inst{31-26} = 0x36; // ds prefix + let Inst{39-32} = !if(ds.has_addr, addr, 0); + let Inst{47-40} = !if(ds.has_data0, data0, 0); + let Inst{55-48} = !if(ds.has_data1, data1, 0); + let Inst{63-56} = !if(ds.has_vdst, vdst, 0); +} + +def DS_ADD_U32_si : DS_Real_si<0x0, DS_ADD_U32>; +def DS_SUB_U32_si : DS_Real_si<0x1, DS_SUB_U32>; +def DS_RSUB_U32_si : DS_Real_si<0x2, DS_RSUB_U32>; +def DS_INC_U32_si : DS_Real_si<0x3, DS_INC_U32>; +def DS_DEC_U32_si : DS_Real_si<0x4, DS_DEC_U32>; +def DS_MIN_I32_si : DS_Real_si<0x5, DS_MIN_I32>; +def DS_MAX_I32_si : DS_Real_si<0x6, DS_MAX_I32>; +def DS_MIN_U32_si : DS_Real_si<0x7, DS_MIN_U32>; +def DS_MAX_U32_si : DS_Real_si<0x8, DS_MAX_U32>; +def DS_AND_B32_si : DS_Real_si<0x9, DS_AND_B32>; +def DS_OR_B32_si : DS_Real_si<0xa, DS_OR_B32>; +def DS_XOR_B32_si : DS_Real_si<0xb, DS_XOR_B32>; +def DS_MSKOR_B32_si : DS_Real_si<0xc, DS_MSKOR_B32>; +def DS_WRITE_B32_si : DS_Real_si<0xd, DS_WRITE_B32>; +def DS_WRITE2_B32_si : DS_Real_si<0xe, DS_WRITE2_B32>; +def DS_WRITE2ST64_B32_si : DS_Real_si<0xf, DS_WRITE2ST64_B32>; +def DS_CMPST_B32_si : DS_Real_si<0x10, DS_CMPST_B32>; +def DS_CMPST_F32_si : DS_Real_si<0x11, DS_CMPST_F32>; +def DS_MIN_F32_si : DS_Real_si<0x12, DS_MIN_F32>; +def DS_MAX_F32_si : DS_Real_si<0x13, DS_MAX_F32>; +def DS_GWS_INIT_si : DS_Real_si<0x19, DS_GWS_INIT>; +def DS_GWS_SEMA_V_si : DS_Real_si<0x1a, DS_GWS_SEMA_V>; +def DS_GWS_SEMA_BR_si : DS_Real_si<0x1b, DS_GWS_SEMA_BR>; +def DS_GWS_SEMA_P_si : DS_Real_si<0x1c, DS_GWS_SEMA_P>; +def DS_GWS_BARRIER_si : DS_Real_si<0x1d, DS_GWS_BARRIER>; +def DS_WRITE_B8_si : DS_Real_si<0x1e, DS_WRITE_B8>; +def DS_WRITE_B16_si : DS_Real_si<0x1f, DS_WRITE_B16>; +def DS_ADD_RTN_U32_si : DS_Real_si<0x20, DS_ADD_RTN_U32>; +def DS_SUB_RTN_U32_si : DS_Real_si<0x21, DS_SUB_RTN_U32>; +def DS_RSUB_RTN_U32_si : DS_Real_si<0x22, DS_RSUB_RTN_U32>; +def DS_INC_RTN_U32_si : DS_Real_si<0x23, DS_INC_RTN_U32>; +def DS_DEC_RTN_U32_si : DS_Real_si<0x24, DS_DEC_RTN_U32>; +def DS_MIN_RTN_I32_si : DS_Real_si<0x25, DS_MIN_RTN_I32>; +def DS_MAX_RTN_I32_si : DS_Real_si<0x26, DS_MAX_RTN_I32>; +def DS_MIN_RTN_U32_si : DS_Real_si<0x27, DS_MIN_RTN_U32>; +def DS_MAX_RTN_U32_si : DS_Real_si<0x28, DS_MAX_RTN_U32>; +def DS_AND_RTN_B32_si : DS_Real_si<0x29, DS_AND_RTN_B32>; +def DS_OR_RTN_B32_si : DS_Real_si<0x2a, DS_OR_RTN_B32>; +def DS_XOR_RTN_B32_si : DS_Real_si<0x2b, DS_XOR_RTN_B32>; +def DS_MSKOR_RTN_B32_si : DS_Real_si<0x2c, DS_MSKOR_RTN_B32>; +def DS_WRXCHG_RTN_B32_si : DS_Real_si<0x2d, DS_WRXCHG_RTN_B32>; +def DS_WRXCHG2_RTN_B32_si : DS_Real_si<0x2e, DS_WRXCHG2_RTN_B32>; +def DS_WRXCHG2ST64_RTN_B32_si : DS_Real_si<0x2f, DS_WRXCHG2ST64_RTN_B32>; +def DS_CMPST_RTN_B32_si : DS_Real_si<0x30, DS_CMPST_RTN_B32>; +def DS_CMPST_RTN_F32_si : DS_Real_si<0x31, DS_CMPST_RTN_F32>; +def DS_MIN_RTN_F32_si : DS_Real_si<0x32, DS_MIN_RTN_F32>; +def DS_MAX_RTN_F32_si : DS_Real_si<0x33, DS_MAX_RTN_F32>; + +// FIXME: this instruction is actually CI/VI +def DS_WRAP_RTN_F32_si : DS_Real_si<0x34, DS_WRAP_RTN_F32>; + +def DS_SWIZZLE_B32_si : DS_Real_si<0x35, DS_SWIZZLE_B32>; +def DS_READ_B32_si : DS_Real_si<0x36, DS_READ_B32>; +def DS_READ2_B32_si : DS_Real_si<0x37, DS_READ2_B32>; +def DS_READ2ST64_B32_si : DS_Real_si<0x38, DS_READ2ST64_B32>; +def DS_READ_I8_si : DS_Real_si<0x39, DS_READ_I8>; +def DS_READ_U8_si : DS_Real_si<0x3a, DS_READ_U8>; +def DS_READ_I16_si : DS_Real_si<0x3b, DS_READ_I16>; +def DS_READ_U16_si : DS_Real_si<0x3c, DS_READ_U16>; +def DS_CONSUME_si : DS_Real_si<0x3d, DS_CONSUME>; +def DS_APPEND_si : DS_Real_si<0x3e, DS_APPEND>; +def DS_ORDERED_COUNT_si : DS_Real_si<0x3f, DS_ORDERED_COUNT>; +def DS_ADD_U64_si : DS_Real_si<0x40, DS_ADD_U64>; +def DS_SUB_U64_si : DS_Real_si<0x41, DS_SUB_U64>; +def DS_RSUB_U64_si : DS_Real_si<0x42, DS_RSUB_U64>; +def DS_INC_U64_si : DS_Real_si<0x43, DS_INC_U64>; +def DS_DEC_U64_si : DS_Real_si<0x44, DS_DEC_U64>; +def DS_MIN_I64_si : DS_Real_si<0x45, DS_MIN_I64>; +def DS_MAX_I64_si : DS_Real_si<0x46, DS_MAX_I64>; +def DS_MIN_U64_si : DS_Real_si<0x47, DS_MIN_U64>; +def DS_MAX_U64_si : DS_Real_si<0x48, DS_MAX_U64>; +def DS_AND_B64_si : DS_Real_si<0x49, DS_AND_B64>; +def DS_OR_B64_si : DS_Real_si<0x4a, DS_OR_B64>; +def DS_XOR_B64_si : DS_Real_si<0x4b, DS_XOR_B64>; +def DS_MSKOR_B64_si : DS_Real_si<0x4c, DS_MSKOR_B64>; +def DS_WRITE_B64_si : DS_Real_si<0x4d, DS_WRITE_B64>; +def DS_WRITE2_B64_si : DS_Real_si<0x4E, DS_WRITE2_B64>; +def DS_WRITE2ST64_B64_si : DS_Real_si<0x4f, DS_WRITE2ST64_B64>; +def DS_CMPST_B64_si : DS_Real_si<0x50, DS_CMPST_B64>; +def DS_CMPST_F64_si : DS_Real_si<0x51, DS_CMPST_F64>; +def DS_MIN_F64_si : DS_Real_si<0x52, DS_MIN_F64>; +def DS_MAX_F64_si : DS_Real_si<0x53, DS_MAX_F64>; + +def DS_ADD_RTN_U64_si : DS_Real_si<0x60, DS_ADD_RTN_U64>; +def DS_SUB_RTN_U64_si : DS_Real_si<0x61, DS_SUB_RTN_U64>; +def DS_RSUB_RTN_U64_si : DS_Real_si<0x62, DS_RSUB_RTN_U64>; +def DS_INC_RTN_U64_si : DS_Real_si<0x63, DS_INC_RTN_U64>; +def DS_DEC_RTN_U64_si : DS_Real_si<0x64, DS_DEC_RTN_U64>; +def DS_MIN_RTN_I64_si : DS_Real_si<0x65, DS_MIN_RTN_I64>; +def DS_MAX_RTN_I64_si : DS_Real_si<0x66, DS_MAX_RTN_I64>; +def DS_MIN_RTN_U64_si : DS_Real_si<0x67, DS_MIN_RTN_U64>; +def DS_MAX_RTN_U64_si : DS_Real_si<0x68, DS_MAX_RTN_U64>; +def DS_AND_RTN_B64_si : DS_Real_si<0x69, DS_AND_RTN_B64>; +def DS_OR_RTN_B64_si : DS_Real_si<0x6a, DS_OR_RTN_B64>; +def DS_XOR_RTN_B64_si : DS_Real_si<0x6b, DS_XOR_RTN_B64>; +def DS_MSKOR_RTN_B64_si : DS_Real_si<0x6c, DS_MSKOR_RTN_B64>; +def DS_WRXCHG_RTN_B64_si : DS_Real_si<0x6d, DS_WRXCHG_RTN_B64>; +def DS_WRXCHG2_RTN_B64_si : DS_Real_si<0x6e, DS_WRXCHG2_RTN_B64>; +def DS_WRXCHG2ST64_RTN_B64_si : DS_Real_si<0x6f, DS_WRXCHG2ST64_RTN_B64>; +def DS_CMPST_RTN_B64_si : DS_Real_si<0x70, DS_CMPST_RTN_B64>; +def DS_CMPST_RTN_F64_si : DS_Real_si<0x71, DS_CMPST_RTN_F64>; +def DS_MIN_RTN_F64_si : DS_Real_si<0x72, DS_MIN_RTN_F64>; +def DS_MAX_RTN_F64_si : DS_Real_si<0x73, DS_MAX_RTN_F64>; + +def DS_READ_B64_si : DS_Real_si<0x76, DS_READ_B64>; +def DS_READ2_B64_si : DS_Real_si<0x77, DS_READ2_B64>; +def DS_READ2ST64_B64_si : DS_Real_si<0x78, DS_READ2ST64_B64>; + +def DS_ADD_SRC2_U32_si : DS_Real_si<0x80, DS_ADD_SRC2_U32>; +def DS_SUB_SRC2_U32_si : DS_Real_si<0x81, DS_SUB_SRC2_U32>; +def DS_RSUB_SRC2_U32_si : DS_Real_si<0x82, DS_RSUB_SRC2_U32>; +def DS_INC_SRC2_U32_si : DS_Real_si<0x83, DS_INC_SRC2_U32>; +def DS_DEC_SRC2_U32_si : DS_Real_si<0x84, DS_DEC_SRC2_U32>; +def DS_MIN_SRC2_I32_si : DS_Real_si<0x85, DS_MIN_SRC2_I32>; +def DS_MAX_SRC2_I32_si : DS_Real_si<0x86, DS_MAX_SRC2_I32>; +def DS_MIN_SRC2_U32_si : DS_Real_si<0x87, DS_MIN_SRC2_U32>; +def DS_MAX_SRC2_U32_si : DS_Real_si<0x88, DS_MAX_SRC2_U32>; +def DS_AND_SRC2_B32_si : DS_Real_si<0x89, DS_AND_SRC2_B32>; +def DS_OR_SRC2_B32_si : DS_Real_si<0x8a, DS_OR_SRC2_B32>; +def DS_XOR_SRC2_B32_si : DS_Real_si<0x8b, DS_XOR_SRC2_B32>; +def DS_WRITE_SRC2_B32_si : DS_Real_si<0x8d, DS_WRITE_SRC2_B32>; + +def DS_MIN_SRC2_F32_si : DS_Real_si<0x92, DS_MIN_SRC2_F32>; +def DS_MAX_SRC2_F32_si : DS_Real_si<0x93, DS_MAX_SRC2_F32>; + +def DS_ADD_SRC2_U64_si : DS_Real_si<0xc0, DS_ADD_SRC2_U64>; +def DS_SUB_SRC2_U64_si : DS_Real_si<0xc1, DS_SUB_SRC2_U64>; +def DS_RSUB_SRC2_U64_si : DS_Real_si<0xc2, DS_RSUB_SRC2_U64>; +def DS_INC_SRC2_U64_si : DS_Real_si<0xc3, DS_INC_SRC2_U64>; +def DS_DEC_SRC2_U64_si : DS_Real_si<0xc4, DS_DEC_SRC2_U64>; +def DS_MIN_SRC2_I64_si : DS_Real_si<0xc5, DS_MIN_SRC2_I64>; +def DS_MAX_SRC2_I64_si : DS_Real_si<0xc6, DS_MAX_SRC2_I64>; +def DS_MIN_SRC2_U64_si : DS_Real_si<0xc7, DS_MIN_SRC2_U64>; +def DS_MAX_SRC2_U64_si : DS_Real_si<0xc8, DS_MAX_SRC2_U64>; +def DS_AND_SRC2_B64_si : DS_Real_si<0xc9, DS_AND_SRC2_B64>; +def DS_OR_SRC2_B64_si : DS_Real_si<0xca, DS_OR_SRC2_B64>; +def DS_XOR_SRC2_B64_si : DS_Real_si<0xcb, DS_XOR_SRC2_B64>; +def DS_WRITE_SRC2_B64_si : DS_Real_si<0xcd, DS_WRITE_SRC2_B64>; + +def DS_MIN_SRC2_F64_si : DS_Real_si<0xd2, DS_MIN_SRC2_F64>; +def DS_MAX_SRC2_F64_si : DS_Real_si<0xd3, DS_MAX_SRC2_F64>; + +//===----------------------------------------------------------------------===// +// VIInstructions.td +//===----------------------------------------------------------------------===// + +class DS_Real_vi op, DS_Pseudo ds> : + DS_Real , + SIMCInstr { + let AssemblerPredicates = [isVI]; + let DecoderNamespace="VI"; + + // encoding + let Inst{7-0} = !if(ds.has_offset0, offset0, 0); + let Inst{15-8} = !if(ds.has_offset1, offset1, 0); + let Inst{16} = !if(ds.has_gds, gds, ds.gdsValue); + let Inst{24-17} = op; + let Inst{31-26} = 0x36; // ds prefix + let Inst{39-32} = !if(ds.has_addr, addr, 0); + let Inst{47-40} = !if(ds.has_data0, data0, 0); + let Inst{55-48} = !if(ds.has_data1, data1, 0); + let Inst{63-56} = !if(ds.has_vdst, vdst, 0); +} + +def DS_ADD_U32_vi : DS_Real_vi<0x0, DS_ADD_U32>; +def DS_SUB_U32_vi : DS_Real_vi<0x1, DS_SUB_U32>; +def DS_RSUB_U32_vi : DS_Real_vi<0x2, DS_RSUB_U32>; +def DS_INC_U32_vi : DS_Real_vi<0x3, DS_INC_U32>; +def DS_DEC_U32_vi : DS_Real_vi<0x4, DS_DEC_U32>; +def DS_MIN_I32_vi : DS_Real_vi<0x5, DS_MIN_I32>; +def DS_MAX_I32_vi : DS_Real_vi<0x6, DS_MAX_I32>; +def DS_MIN_U32_vi : DS_Real_vi<0x7, DS_MIN_U32>; +def DS_MAX_U32_vi : DS_Real_vi<0x8, DS_MAX_U32>; +def DS_AND_B32_vi : DS_Real_vi<0x9, DS_AND_B32>; +def DS_OR_B32_vi : DS_Real_vi<0xa, DS_OR_B32>; +def DS_XOR_B32_vi : DS_Real_vi<0xb, DS_XOR_B32>; +def DS_MSKOR_B32_vi : DS_Real_vi<0xc, DS_MSKOR_B32>; +def DS_WRITE_B32_vi : DS_Real_vi<0xd, DS_WRITE_B32>; +def DS_WRITE2_B32_vi : DS_Real_vi<0xe, DS_WRITE2_B32>; +def DS_WRITE2ST64_B32_vi : DS_Real_vi<0xf, DS_WRITE2ST64_B32>; +def DS_CMPST_B32_vi : DS_Real_vi<0x10, DS_CMPST_B32>; +def DS_CMPST_F32_vi : DS_Real_vi<0x11, DS_CMPST_F32>; +def DS_MIN_F32_vi : DS_Real_vi<0x12, DS_MIN_F32>; +def DS_MAX_F32_vi : DS_Real_vi<0x13, DS_MAX_F32>; +def DS_GWS_INIT_vi : DS_Real_vi<0x19, DS_GWS_INIT>; +def DS_GWS_SEMA_V_vi : DS_Real_vi<0x1a, DS_GWS_SEMA_V>; +def DS_GWS_SEMA_BR_vi : DS_Real_vi<0x1b, DS_GWS_SEMA_BR>; +def DS_GWS_SEMA_P_vi : DS_Real_vi<0x1c, DS_GWS_SEMA_P>; +def DS_GWS_BARRIER_vi : DS_Real_vi<0x1d, DS_GWS_BARRIER>; +def DS_WRITE_B8_vi : DS_Real_vi<0x1e, DS_WRITE_B8>; +def DS_WRITE_B16_vi : DS_Real_vi<0x1f, DS_WRITE_B16>; +def DS_ADD_RTN_U32_vi : DS_Real_vi<0x20, DS_ADD_RTN_U32>; +def DS_SUB_RTN_U32_vi : DS_Real_vi<0x21, DS_SUB_RTN_U32>; +def DS_RSUB_RTN_U32_vi : DS_Real_vi<0x22, DS_RSUB_RTN_U32>; +def DS_INC_RTN_U32_vi : DS_Real_vi<0x23, DS_INC_RTN_U32>; +def DS_DEC_RTN_U32_vi : DS_Real_vi<0x24, DS_DEC_RTN_U32>; +def DS_MIN_RTN_I32_vi : DS_Real_vi<0x25, DS_MIN_RTN_I32>; +def DS_MAX_RTN_I32_vi : DS_Real_vi<0x26, DS_MAX_RTN_I32>; +def DS_MIN_RTN_U32_vi : DS_Real_vi<0x27, DS_MIN_RTN_U32>; +def DS_MAX_RTN_U32_vi : DS_Real_vi<0x28, DS_MAX_RTN_U32>; +def DS_AND_RTN_B32_vi : DS_Real_vi<0x29, DS_AND_RTN_B32>; +def DS_OR_RTN_B32_vi : DS_Real_vi<0x2a, DS_OR_RTN_B32>; +def DS_XOR_RTN_B32_vi : DS_Real_vi<0x2b, DS_XOR_RTN_B32>; +def DS_MSKOR_RTN_B32_vi : DS_Real_vi<0x2c, DS_MSKOR_RTN_B32>; +def DS_WRXCHG_RTN_B32_vi : DS_Real_vi<0x2d, DS_WRXCHG_RTN_B32>; +def DS_WRXCHG2_RTN_B32_vi : DS_Real_vi<0x2e, DS_WRXCHG2_RTN_B32>; +def DS_WRXCHG2ST64_RTN_B32_vi : DS_Real_vi<0x2f, DS_WRXCHG2ST64_RTN_B32>; +def DS_CMPST_RTN_B32_vi : DS_Real_vi<0x30, DS_CMPST_RTN_B32>; +def DS_CMPST_RTN_F32_vi : DS_Real_vi<0x31, DS_CMPST_RTN_F32>; +def DS_MIN_RTN_F32_vi : DS_Real_vi<0x32, DS_MIN_RTN_F32>; +def DS_MAX_RTN_F32_vi : DS_Real_vi<0x33, DS_MAX_RTN_F32>; +def DS_WRAP_RTN_F32_vi : DS_Real_vi<0x34, DS_WRAP_RTN_F32>; +def DS_READ_B32_vi : DS_Real_vi<0x36, DS_READ_B32>; +def DS_READ2_B32_vi : DS_Real_vi<0x37, DS_READ2_B32>; +def DS_READ2ST64_B32_vi : DS_Real_vi<0x38, DS_READ2ST64_B32>; +def DS_READ_I8_vi : DS_Real_vi<0x39, DS_READ_I8>; +def DS_READ_U8_vi : DS_Real_vi<0x3a, DS_READ_U8>; +def DS_READ_I16_vi : DS_Real_vi<0x3b, DS_READ_I16>; +def DS_READ_U16_vi : DS_Real_vi<0x3c, DS_READ_U16>; +def DS_SWIZZLE_B32_vi : DS_Real_vi<0x3d, DS_SWIZZLE_B32>; +def DS_PERMUTE_B32_vi : DS_Real_vi<0x3e, DS_PERMUTE_B32>; +def DS_BPERMUTE_B32_vi : DS_Real_vi<0x3f, DS_BPERMUTE_B32>; + +def DS_ADD_U64_vi : DS_Real_vi<0x40, DS_ADD_U64>; +def DS_SUB_U64_vi : DS_Real_vi<0x41, DS_SUB_U64>; +def DS_RSUB_U64_vi : DS_Real_vi<0x42, DS_RSUB_U64>; +def DS_INC_U64_vi : DS_Real_vi<0x43, DS_INC_U64>; +def DS_DEC_U64_vi : DS_Real_vi<0x44, DS_DEC_U64>; +def DS_MIN_I64_vi : DS_Real_vi<0x45, DS_MIN_I64>; +def DS_MAX_I64_vi : DS_Real_vi<0x46, DS_MAX_I64>; +def DS_MIN_U64_vi : DS_Real_vi<0x47, DS_MIN_U64>; +def DS_MAX_U64_vi : DS_Real_vi<0x48, DS_MAX_U64>; +def DS_AND_B64_vi : DS_Real_vi<0x49, DS_AND_B64>; +def DS_OR_B64_vi : DS_Real_vi<0x4a, DS_OR_B64>; +def DS_XOR_B64_vi : DS_Real_vi<0x4b, DS_XOR_B64>; +def DS_MSKOR_B64_vi : DS_Real_vi<0x4c, DS_MSKOR_B64>; +def DS_WRITE_B64_vi : DS_Real_vi<0x4d, DS_WRITE_B64>; +def DS_WRITE2_B64_vi : DS_Real_vi<0x4E, DS_WRITE2_B64>; +def DS_WRITE2ST64_B64_vi : DS_Real_vi<0x4f, DS_WRITE2ST64_B64>; +def DS_CMPST_B64_vi : DS_Real_vi<0x50, DS_CMPST_B64>; +def DS_CMPST_F64_vi : DS_Real_vi<0x51, DS_CMPST_F64>; +def DS_MIN_F64_vi : DS_Real_vi<0x52, DS_MIN_F64>; +def DS_MAX_F64_vi : DS_Real_vi<0x53, DS_MAX_F64>; + +def DS_ADD_RTN_U64_vi : DS_Real_vi<0x60, DS_ADD_RTN_U64>; +def DS_SUB_RTN_U64_vi : DS_Real_vi<0x61, DS_SUB_RTN_U64>; +def DS_RSUB_RTN_U64_vi : DS_Real_vi<0x62, DS_RSUB_RTN_U64>; +def DS_INC_RTN_U64_vi : DS_Real_vi<0x63, DS_INC_RTN_U64>; +def DS_DEC_RTN_U64_vi : DS_Real_vi<0x64, DS_DEC_RTN_U64>; +def DS_MIN_RTN_I64_vi : DS_Real_vi<0x65, DS_MIN_RTN_I64>; +def DS_MAX_RTN_I64_vi : DS_Real_vi<0x66, DS_MAX_RTN_I64>; +def DS_MIN_RTN_U64_vi : DS_Real_vi<0x67, DS_MIN_RTN_U64>; +def DS_MAX_RTN_U64_vi : DS_Real_vi<0x68, DS_MAX_RTN_U64>; +def DS_AND_RTN_B64_vi : DS_Real_vi<0x69, DS_AND_RTN_B64>; +def DS_OR_RTN_B64_vi : DS_Real_vi<0x6a, DS_OR_RTN_B64>; +def DS_XOR_RTN_B64_vi : DS_Real_vi<0x6b, DS_XOR_RTN_B64>; +def DS_MSKOR_RTN_B64_vi : DS_Real_vi<0x6c, DS_MSKOR_RTN_B64>; +def DS_WRXCHG_RTN_B64_vi : DS_Real_vi<0x6d, DS_WRXCHG_RTN_B64>; +def DS_WRXCHG2_RTN_B64_vi : DS_Real_vi<0x6e, DS_WRXCHG2_RTN_B64>; +def DS_WRXCHG2ST64_RTN_B64_vi : DS_Real_vi<0x6f, DS_WRXCHG2ST64_RTN_B64>; +def DS_CMPST_RTN_B64_vi : DS_Real_vi<0x70, DS_CMPST_RTN_B64>; +def DS_CMPST_RTN_F64_vi : DS_Real_vi<0x71, DS_CMPST_RTN_F64>; +def DS_MIN_RTN_F64_vi : DS_Real_vi<0x72, DS_MIN_RTN_F64>; +def DS_MAX_RTN_F64_vi : DS_Real_vi<0x73, DS_MAX_RTN_F64>; + +def DS_READ_B64_vi : DS_Real_vi<0x76, DS_READ_B64>; +def DS_READ2_B64_vi : DS_Real_vi<0x77, DS_READ2_B64>; +def DS_READ2ST64_B64_vi : DS_Real_vi<0x78, DS_READ2ST64_B64>; + +def DS_ADD_SRC2_U32_vi : DS_Real_vi<0x80, DS_ADD_SRC2_U32>; +def DS_SUB_SRC2_U32_vi : DS_Real_vi<0x81, DS_SUB_SRC2_U32>; +def DS_RSUB_SRC2_U32_vi : DS_Real_vi<0x82, DS_RSUB_SRC2_U32>; +def DS_INC_SRC2_U32_vi : DS_Real_vi<0x83, DS_INC_SRC2_U32>; +def DS_DEC_SRC2_U32_vi : DS_Real_vi<0x84, DS_DEC_SRC2_U32>; +def DS_MIN_SRC2_I32_vi : DS_Real_vi<0x85, DS_MIN_SRC2_I32>; +def DS_MAX_SRC2_I32_vi : DS_Real_vi<0x86, DS_MAX_SRC2_I32>; +def DS_MIN_SRC2_U32_vi : DS_Real_vi<0x87, DS_MIN_SRC2_U32>; +def DS_MAX_SRC2_U32_vi : DS_Real_vi<0x88, DS_MAX_SRC2_U32>; +def DS_AND_SRC2_B32_vi : DS_Real_vi<0x89, DS_AND_SRC2_B32>; +def DS_OR_SRC2_B32_vi : DS_Real_vi<0x8a, DS_OR_SRC2_B32>; +def DS_XOR_SRC2_B32_vi : DS_Real_vi<0x8b, DS_XOR_SRC2_B32>; +def DS_WRITE_SRC2_B32_vi : DS_Real_vi<0x8d, DS_WRITE_SRC2_B32>; +def DS_MIN_SRC2_F32_vi : DS_Real_vi<0x92, DS_MIN_SRC2_F32>; +def DS_MAX_SRC2_F32_vi : DS_Real_vi<0x93, DS_MAX_SRC2_F32>; +def DS_ADD_SRC2_U64_vi : DS_Real_vi<0xc0, DS_ADD_SRC2_U64>; +def DS_SUB_SRC2_U64_vi : DS_Real_vi<0xc1, DS_SUB_SRC2_U64>; +def DS_RSUB_SRC2_U64_vi : DS_Real_vi<0xc2, DS_RSUB_SRC2_U64>; +def DS_INC_SRC2_U64_vi : DS_Real_vi<0xc3, DS_INC_SRC2_U64>; +def DS_DEC_SRC2_U64_vi : DS_Real_vi<0xc4, DS_DEC_SRC2_U64>; +def DS_MIN_SRC2_I64_vi : DS_Real_vi<0xc5, DS_MIN_SRC2_I64>; +def DS_MAX_SRC2_I64_vi : DS_Real_vi<0xc6, DS_MAX_SRC2_I64>; +def DS_MIN_SRC2_U64_vi : DS_Real_vi<0xc7, DS_MIN_SRC2_U64>; +def DS_MAX_SRC2_U64_vi : DS_Real_vi<0xc8, DS_MAX_SRC2_U64>; +def DS_AND_SRC2_B64_vi : DS_Real_vi<0xc9, DS_AND_SRC2_B64>; +def DS_OR_SRC2_B64_vi : DS_Real_vi<0xca, DS_OR_SRC2_B64>; +def DS_XOR_SRC2_B64_vi : DS_Real_vi<0xcb, DS_XOR_SRC2_B64>; +def DS_WRITE_SRC2_B64_vi : DS_Real_vi<0xcd, DS_WRITE_SRC2_B64>; +def DS_MIN_SRC2_F64_vi : DS_Real_vi<0xd2, DS_MIN_SRC2_F64>; +def DS_MAX_SRC2_F64_vi : DS_Real_vi<0xd3, DS_MAX_SRC2_F64>; Index: llvm/trunk/lib/Target/AMDGPU/SIInstrFormats.td =================================================================== --- llvm/trunk/lib/Target/AMDGPU/SIInstrFormats.td +++ llvm/trunk/lib/Target/AMDGPU/SIInstrFormats.td @@ -482,26 +482,6 @@ let Inst{31-26} = 0x32; // encoding } -class DSe op> : Enc64 { - bits<8> vdst; - bits<1> gds; - bits<8> addr; - bits<8> data0; - bits<8> data1; - bits<8> offset0; - bits<8> offset1; - - let Inst{7-0} = offset0; - let Inst{15-8} = offset1; - let Inst{17} = gds; - let Inst{25-18} = op; - let Inst{31-26} = 0x36; //encoding - let Inst{39-32} = addr; - let Inst{47-40} = data0; - let Inst{55-48} = data1; - let Inst{63-56} = vdst; -} - class MUBUFe op> : Enc64 { bits<12> offset; bits<1> offen; @@ -666,23 +646,6 @@ // Vector I/O operations //===----------------------------------------------------------------------===// -class DS pattern> : - InstSI { - - let LGKM_CNT = 1; - let DS = 1; - let UseNamedOperandTable = 1; - let Uses = [M0, EXEC]; - - // Most instruction load and store data, so set this as the default. - let mayLoad = 1; - let mayStore = 1; - - let hasSideEffects = 0; - let AsmMatchConverter = "cvtDS"; - let SchedRW = [WriteLDS]; -} - class MUBUF pattern> : InstSI { Index: llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.td =================================================================== --- llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.td +++ llvm/trunk/lib/Target/AMDGPU/SIInstrInfo.td @@ -2585,266 +2585,6 @@ } //===----------------------------------------------------------------------===// -// Vector I/O classes -//===----------------------------------------------------------------------===// - -class DS_Pseudo pattern> : - DS , - SIMCInstr { - let isPseudo = 1; - let isCodeGenOnly = 1; -} - -class DS_Real_si op, string opName, dag outs, dag ins, string asm> : - DS , - DSe , - SIMCInstr { - let isCodeGenOnly = 0; - let AssemblerPredicates = [isSICI]; - let DecoderNamespace="SICI"; - let DisableDecoder = DisableSIDecoder; -} - -class DS_Real_vi op, string opName, dag outs, dag ins, string asm> : - DS , - DSe_vi , - SIMCInstr { - let isCodeGenOnly = 0; - let AssemblerPredicates = [isVI]; - let DecoderNamespace="VI"; - let DisableDecoder = DisableVIDecoder; -} - -class DS_Off16_Real_si op, string opName, dag outs, dag ins, string asm> : - DS_Real_si { - - // Single load interpret the 2 i8imm operands as a single i16 offset. - bits<16> offset; - let offset0 = offset{7-0}; - let offset1 = offset{15-8}; -} - -class DS_Off16_Real_vi op, string opName, dag outs, dag ins, string asm> : - DS_Real_vi { - - // Single load interpret the 2 i8imm operands as a single i16 offset. - bits<16> offset; - let offset0 = offset{7-0}; - let offset1 = offset{15-8}; -} - -multiclass DS_1A_RET_ { - - def "" : DS_Pseudo ; - - let data0 = 0, data1 = 0 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } -} - -// TODO: DS_1A_RET can be inherited from DS_1A_RET_ but its not working -// for some reason. In fact we can remove this class if use dsop everywhere -multiclass DS_1A_RET op, string opName, RegisterClass rc, - dag outs = (outs rc:$vdst), - dag ins = (ins VGPR_32:$addr, offset:$offset, gds:$gds), - string asm = opName#" $vdst, $addr"#"$offset$gds"> { - - def "" : DS_Pseudo ; - - let data0 = 0, data1 = 0 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } -} - -multiclass DS_1A_Off8_RET op, string opName, RegisterClass rc, - dag outs = (outs rc:$vdst), - dag ins = (ins VGPR_32:$addr, offset0:$offset0, offset1:$offset1, - gds:$gds), - string asm = opName#" $vdst, $addr"#"$offset0"#"$offset1$gds"> { - - def "" : DS_Pseudo ; - - let data0 = 0, data1 = 0, AsmMatchConverter = "cvtDSOffset01" in { - def _si : DS_Real_si ; - def _vi : DS_Real_vi ; - } -} - -multiclass DS_1A1D_NORET op, string opName, RegisterClass rc, - dag outs = (outs), - dag ins = (ins VGPR_32:$addr, rc:$data0, offset:$offset, gds:$gds), - string asm = opName#" $addr, $data0"#"$offset$gds"> { - - def "" : DS_Pseudo , - AtomicNoRet; - - let data1 = 0, vdst = 0 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } -} - -multiclass DS_1A_Off8_NORET op, string opName, - dag outs = (outs), - dag ins = (ins VGPR_32:$addr, - offset0:$offset0, offset1:$offset1, gds:$gds), - string asm = opName#" $addr $offset0"#"$offset1$gds"> { - - def "" : DS_Pseudo ; - - let data0 = 0, data1 = 0, vdst = 0, AsmMatchConverter = "cvtDSOffset01" in { - def _si : DS_Real_si ; - def _vi : DS_Real_vi ; - } -} - -multiclass DS_1A2D_Off8_NORET op, string opName, RegisterClass rc, - dag outs = (outs), - dag ins = (ins VGPR_32:$addr, rc:$data0, rc:$data1, - offset0:$offset0, offset1:$offset1, gds:$gds), - string asm = opName#" $addr, $data0, $data1$offset0$offset1$gds"> { - - def "" : DS_Pseudo ; - - let vdst = 0, AsmMatchConverter = "cvtDSOffset01" in { - def _si : DS_Real_si ; - def _vi : DS_Real_vi ; - } -} - -multiclass DS_1A1D_RET op, string opName, RegisterClass rc, - string noRetOp = "", - dag outs = (outs rc:$vdst), - dag ins = (ins VGPR_32:$addr, rc:$data0, offset:$offset, gds:$gds), - string asm = opName#" $vdst, $addr, $data0"#"$offset$gds"> { - - let hasPostISelHook = 1 in { - def "" : DS_Pseudo , - AtomicNoRet; - - let data1 = 0 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } - } -} - -multiclass DS_1A1D_PERMUTE op, string opName, RegisterClass rc, - SDPatternOperator node = null_frag, - dag outs = (outs rc:$vdst), - dag ins = (ins VGPR_32:$addr, rc:$data0, offset:$offset), - string asm = opName#" $vdst, $addr, $data0"#"$offset"> { - - let mayLoad = 0, mayStore = 0, isConvergent = 1 in { - def "" : DS_Pseudo ; - - let data1 = 0, gds = 0 in { - def "_vi" : DS_Off16_Real_vi ; - } - } -} - -multiclass DS_1A2D_RET_m op, string opName, RegisterClass rc, - string noRetOp = "", dag ins, - dag outs = (outs rc:$vdst), - string asm = opName#" $vdst, $addr, $data0, $data1"#"$offset"#"$gds"> { - - let hasPostISelHook = 1 in { - def "" : DS_Pseudo , - AtomicNoRet; - - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } -} - -multiclass DS_1A2D_RET op, string asm, RegisterClass rc, - string noRetOp = "", RegisterClass src = rc> : - DS_1A2D_RET_m ; - -multiclass DS_1A2D_NORET op, string opName, RegisterClass rc, - string noRetOp = opName, - dag outs = (outs), - dag ins = (ins VGPR_32:$addr, rc:$data0, rc:$data1, - offset:$offset, gds:$gds), - string asm = opName#" $addr, $data0, $data1"#"$offset"#"$gds"> { - - def "" : DS_Pseudo , - AtomicNoRet; - - let vdst = 0 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } -} - -multiclass DS_0A_RET op, string opName, - dag outs = (outs VGPR_32:$vdst), - dag ins = (ins offset:$offset, gds:$gds), - string asm = opName#" $vdst"#"$offset"#"$gds"> { - - let mayLoad = 1, mayStore = 1 in { - def "" : DS_Pseudo ; - - let addr = 0, data0 = 0, data1 = 0 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } // end addr = 0, data0 = 0, data1 = 0 - } // end mayLoad = 1, mayStore = 1 -} - -multiclass DS_1A_RET_GDS op, string opName, - dag outs = (outs VGPR_32:$vdst), - dag ins = (ins VGPR_32:$addr, offset:$offset), - string asm = opName#" $vdst, $addr"#"$offset gds"> { - - def "" : DS_Pseudo ; - - let data0 = 0, data1 = 0, gds = 1 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } // end data0 = 0, data1 = 0, gds = 1 -} - -multiclass DS_1A_GDS op, string opName, - dag outs = (outs), - dag ins = (ins VGPR_32:$addr), - string asm = opName#" $addr gds"> { - - def "" : DS_Pseudo ; - - let vdst = 0, data0 = 0, data1 = 0, offset0 = 0, offset1 = 0, gds = 1 in { - def _si : DS_Real_si ; - def _vi : DS_Real_vi ; - } // end vdst = 0, data = 0, data1 = 0, gds = 1 -} - -multiclass DS_1A op, string opName, - dag outs = (outs), - dag ins = (ins VGPR_32:$addr, offset:$offset, gds:$gds), - string asm = opName#" $addr"#"$offset"#"$gds"> { - - let mayLoad = 1, mayStore = 1 in { - def "" : DS_Pseudo ; - - let vdst = 0, data0 = 0, data1 = 0 in { - def _si : DS_Off16_Real_si ; - def _vi : DS_Off16_Real_vi ; - } // let vdst = 0, data0 = 0, data1 = 0 - } // end mayLoad = 1, mayStore = 1 -} - -//===----------------------------------------------------------------------===// // MTBUF classes //===----------------------------------------------------------------------===// @@ -3727,3 +3467,5 @@ include "SIInstructions.td" include "CIInstructions.td" include "VIInstructions.td" + +include "DSInstructions.td" Index: llvm/trunk/lib/Target/AMDGPU/SIInstructions.td =================================================================== --- llvm/trunk/lib/Target/AMDGPU/SIInstructions.td +++ llvm/trunk/lib/Target/AMDGPU/SIInstructions.td @@ -760,167 +760,6 @@ defm V_CMPX_CLASS_F64 : VOPCX_CLASS_F64 , "v_cmpx_class_f64">; //===----------------------------------------------------------------------===// -// DS Instructions -//===----------------------------------------------------------------------===// - -defm DS_ADD_U32 : DS_1A1D_NORET <0x0, "ds_add_u32", VGPR_32>; -defm DS_SUB_U32 : DS_1A1D_NORET <0x1, "ds_sub_u32", VGPR_32>; -defm DS_RSUB_U32 : DS_1A1D_NORET <0x2, "ds_rsub_u32", VGPR_32>; -defm DS_INC_U32 : DS_1A1D_NORET <0x3, "ds_inc_u32", VGPR_32>; -defm DS_DEC_U32 : DS_1A1D_NORET <0x4, "ds_dec_u32", VGPR_32>; -defm DS_MIN_I32 : DS_1A1D_NORET <0x5, "ds_min_i32", VGPR_32>; -defm DS_MAX_I32 : DS_1A1D_NORET <0x6, "ds_max_i32", VGPR_32>; -defm DS_MIN_U32 : DS_1A1D_NORET <0x7, "ds_min_u32", VGPR_32>; -defm DS_MAX_U32 : DS_1A1D_NORET <0x8, "ds_max_u32", VGPR_32>; -defm DS_AND_B32 : DS_1A1D_NORET <0x9, "ds_and_b32", VGPR_32>; -defm DS_OR_B32 : DS_1A1D_NORET <0xa, "ds_or_b32", VGPR_32>; -defm DS_XOR_B32 : DS_1A1D_NORET <0xb, "ds_xor_b32", VGPR_32>; -defm DS_MSKOR_B32 : DS_1A2D_NORET <0xc, "ds_mskor_b32", VGPR_32>; -let mayLoad = 0 in { -defm DS_WRITE_B32 : DS_1A1D_NORET <0xd, "ds_write_b32", VGPR_32>; -defm DS_WRITE2_B32 : DS_1A2D_Off8_NORET <0xe, "ds_write2_b32", VGPR_32>; -defm DS_WRITE2ST64_B32 : DS_1A2D_Off8_NORET <0xf, "ds_write2st64_b32", VGPR_32>; -} -defm DS_CMPST_B32 : DS_1A2D_NORET <0x10, "ds_cmpst_b32", VGPR_32>; -defm DS_CMPST_F32 : DS_1A2D_NORET <0x11, "ds_cmpst_f32", VGPR_32>; -defm DS_MIN_F32 : DS_1A2D_NORET <0x12, "ds_min_f32", VGPR_32>; -defm DS_MAX_F32 : DS_1A2D_NORET <0x13, "ds_max_f32", VGPR_32>; - -defm DS_GWS_INIT : DS_1A_GDS <0x19, "ds_gws_init">; -defm DS_GWS_SEMA_V : DS_1A_GDS <0x1a, "ds_gws_sema_v">; -defm DS_GWS_SEMA_BR : DS_1A_GDS <0x1b, "ds_gws_sema_br">; -defm DS_GWS_SEMA_P : DS_1A_GDS <0x1c, "ds_gws_sema_p">; -defm DS_GWS_BARRIER : DS_1A_GDS <0x1d, "ds_gws_barrier">; -let mayLoad = 0 in { -defm DS_WRITE_B8 : DS_1A1D_NORET <0x1e, "ds_write_b8", VGPR_32>; -defm DS_WRITE_B16 : DS_1A1D_NORET <0x1f, "ds_write_b16", VGPR_32>; -} -defm DS_ADD_RTN_U32 : DS_1A1D_RET <0x20, "ds_add_rtn_u32", VGPR_32, "ds_add_u32">; -defm DS_SUB_RTN_U32 : DS_1A1D_RET <0x21, "ds_sub_rtn_u32", VGPR_32, "ds_sub_u32">; -defm DS_RSUB_RTN_U32 : DS_1A1D_RET <0x22, "ds_rsub_rtn_u32", VGPR_32, "ds_rsub_u32">; -defm DS_INC_RTN_U32 : DS_1A1D_RET <0x23, "ds_inc_rtn_u32", VGPR_32, "ds_inc_u32">; -defm DS_DEC_RTN_U32 : DS_1A1D_RET <0x24, "ds_dec_rtn_u32", VGPR_32, "ds_dec_u32">; -defm DS_MIN_RTN_I32 : DS_1A1D_RET <0x25, "ds_min_rtn_i32", VGPR_32, "ds_min_i32">; -defm DS_MAX_RTN_I32 : DS_1A1D_RET <0x26, "ds_max_rtn_i32", VGPR_32, "ds_max_i32">; -defm DS_MIN_RTN_U32 : DS_1A1D_RET <0x27, "ds_min_rtn_u32", VGPR_32, "ds_min_u32">; -defm DS_MAX_RTN_U32 : DS_1A1D_RET <0x28, "ds_max_rtn_u32", VGPR_32, "ds_max_u32">; -defm DS_AND_RTN_B32 : DS_1A1D_RET <0x29, "ds_and_rtn_b32", VGPR_32, "ds_and_b32">; -defm DS_OR_RTN_B32 : DS_1A1D_RET <0x2a, "ds_or_rtn_b32", VGPR_32, "ds_or_b32">; -defm DS_XOR_RTN_B32 : DS_1A1D_RET <0x2b, "ds_xor_rtn_b32", VGPR_32, "ds_xor_b32">; -defm DS_MSKOR_RTN_B32 : DS_1A2D_RET <0x2c, "ds_mskor_rtn_b32", VGPR_32, "ds_mskor_b32">; -defm DS_WRXCHG_RTN_B32 : DS_1A1D_RET <0x2d, "ds_wrxchg_rtn_b32", VGPR_32>; -defm DS_WRXCHG2_RTN_B32 : DS_1A2D_RET < - 0x2e, "ds_wrxchg2_rtn_b32", VReg_64, "", VGPR_32 ->; -defm DS_WRXCHG2ST64_RTN_B32 : DS_1A2D_RET < - 0x2f, "ds_wrxchg2st64_rtn_b32", VReg_64, "", VGPR_32 ->; -defm DS_CMPST_RTN_B32 : DS_1A2D_RET <0x30, "ds_cmpst_rtn_b32", VGPR_32, "ds_cmpst_b32">; -defm DS_CMPST_RTN_F32 : DS_1A2D_RET <0x31, "ds_cmpst_rtn_f32", VGPR_32, "ds_cmpst_f32">; -defm DS_MIN_RTN_F32 : DS_1A2D_RET <0x32, "ds_min_rtn_f32", VGPR_32, "ds_min_f32">; -defm DS_MAX_RTN_F32 : DS_1A2D_RET <0x33, "ds_max_rtn_f32", VGPR_32, "ds_max_f32">; - -let Uses = [EXEC], mayLoad =0, mayStore = 0, isConvergent = 1 in { -defm DS_SWIZZLE_B32 : DS_1A_RET_ , "ds_swizzle_b32", VGPR_32>; -} - -let mayStore = 0 in { -defm DS_READ_B32 : DS_1A_RET <0x36, "ds_read_b32", VGPR_32>; -defm DS_READ2_B32 : DS_1A_Off8_RET <0x37, "ds_read2_b32", VReg_64>; -defm DS_READ2ST64_B32 : DS_1A_Off8_RET <0x38, "ds_read2st64_b32", VReg_64>; -defm DS_READ_I8 : DS_1A_RET <0x39, "ds_read_i8", VGPR_32>; -defm DS_READ_U8 : DS_1A_RET <0x3a, "ds_read_u8", VGPR_32>; -defm DS_READ_I16 : DS_1A_RET <0x3b, "ds_read_i16", VGPR_32>; -defm DS_READ_U16 : DS_1A_RET <0x3c, "ds_read_u16", VGPR_32>; -} -defm DS_CONSUME : DS_0A_RET <0x3d, "ds_consume">; -defm DS_APPEND : DS_0A_RET <0x3e, "ds_append">; -defm DS_ORDERED_COUNT : DS_1A_RET_GDS <0x3f, "ds_ordered_count">; -defm DS_ADD_U64 : DS_1A1D_NORET <0x40, "ds_add_u64", VReg_64>; -defm DS_SUB_U64 : DS_1A1D_NORET <0x41, "ds_sub_u64", VReg_64>; -defm DS_RSUB_U64 : DS_1A1D_NORET <0x42, "ds_rsub_u64", VReg_64>; -defm DS_INC_U64 : DS_1A1D_NORET <0x43, "ds_inc_u64", VReg_64>; -defm DS_DEC_U64 : DS_1A1D_NORET <0x44, "ds_dec_u64", VReg_64>; -defm DS_MIN_I64 : DS_1A1D_NORET <0x45, "ds_min_i64", VReg_64>; -defm DS_MAX_I64 : DS_1A1D_NORET <0x46, "ds_max_i64", VReg_64>; -defm DS_MIN_U64 : DS_1A1D_NORET <0x47, "ds_min_u64", VReg_64>; -defm DS_MAX_U64 : DS_1A1D_NORET <0x48, "ds_max_u64", VReg_64>; -defm DS_AND_B64 : DS_1A1D_NORET <0x49, "ds_and_b64", VReg_64>; -defm DS_OR_B64 : DS_1A1D_NORET <0x4a, "ds_or_b64", VReg_64>; -defm DS_XOR_B64 : DS_1A1D_NORET <0x4b, "ds_xor_b64", VReg_64>; -defm DS_MSKOR_B64 : DS_1A2D_NORET <0x4c, "ds_mskor_b64", VReg_64>; -let mayLoad = 0 in { -defm DS_WRITE_B64 : DS_1A1D_NORET <0x4d, "ds_write_b64", VReg_64>; -defm DS_WRITE2_B64 : DS_1A2D_Off8_NORET <0x4E, "ds_write2_b64", VReg_64>; -defm DS_WRITE2ST64_B64 : DS_1A2D_Off8_NORET <0x4f, "ds_write2st64_b64", VReg_64>; -} -defm DS_CMPST_B64 : DS_1A2D_NORET <0x50, "ds_cmpst_b64", VReg_64>; -defm DS_CMPST_F64 : DS_1A2D_NORET <0x51, "ds_cmpst_f64", VReg_64>; -defm DS_MIN_F64 : DS_1A1D_NORET <0x52, "ds_min_f64", VReg_64>; -defm DS_MAX_F64 : DS_1A1D_NORET <0x53, "ds_max_f64", VReg_64>; - -defm DS_ADD_RTN_U64 : DS_1A1D_RET <0x60, "ds_add_rtn_u64", VReg_64, "ds_add_u64">; -defm DS_SUB_RTN_U64 : DS_1A1D_RET <0x61, "ds_sub_rtn_u64", VReg_64, "ds_sub_u64">; -defm DS_RSUB_RTN_U64 : DS_1A1D_RET <0x62, "ds_rsub_rtn_u64", VReg_64, "ds_rsub_u64">; -defm DS_INC_RTN_U64 : DS_1A1D_RET <0x63, "ds_inc_rtn_u64", VReg_64, "ds_inc_u64">; -defm DS_DEC_RTN_U64 : DS_1A1D_RET <0x64, "ds_dec_rtn_u64", VReg_64, "ds_dec_u64">; -defm DS_MIN_RTN_I64 : DS_1A1D_RET <0x65, "ds_min_rtn_i64", VReg_64, "ds_min_i64">; -defm DS_MAX_RTN_I64 : DS_1A1D_RET <0x66, "ds_max_rtn_i64", VReg_64, "ds_max_i64">; -defm DS_MIN_RTN_U64 : DS_1A1D_RET <0x67, "ds_min_rtn_u64", VReg_64, "ds_min_u64">; -defm DS_MAX_RTN_U64 : DS_1A1D_RET <0x68, "ds_max_rtn_u64", VReg_64, "ds_max_u64">; -defm DS_AND_RTN_B64 : DS_1A1D_RET <0x69, "ds_and_rtn_b64", VReg_64, "ds_and_b64">; -defm DS_OR_RTN_B64 : DS_1A1D_RET <0x6a, "ds_or_rtn_b64", VReg_64, "ds_or_b64">; -defm DS_XOR_RTN_B64 : DS_1A1D_RET <0x6b, "ds_xor_rtn_b64", VReg_64, "ds_xor_b64">; -defm DS_MSKOR_RTN_B64 : DS_1A2D_RET <0x6c, "ds_mskor_rtn_b64", VReg_64, "ds_mskor_b64">; -defm DS_WRXCHG_RTN_B64 : DS_1A1D_RET <0x6d, "ds_wrxchg_rtn_b64", VReg_64, "ds_wrxchg_b64">; -defm DS_WRXCHG2_RTN_B64 : DS_1A2D_RET <0x6e, "ds_wrxchg2_rtn_b64", VReg_128, "ds_wrxchg2_b64", VReg_64>; -defm DS_WRXCHG2ST64_RTN_B64 : DS_1A2D_RET <0x6f, "ds_wrxchg2st64_rtn_b64", VReg_128, "ds_wrxchg2st64_b64", VReg_64>; -defm DS_CMPST_RTN_B64 : DS_1A2D_RET <0x70, "ds_cmpst_rtn_b64", VReg_64, "ds_cmpst_b64">; -defm DS_CMPST_RTN_F64 : DS_1A2D_RET <0x71, "ds_cmpst_rtn_f64", VReg_64, "ds_cmpst_f64">; -defm DS_MIN_RTN_F64 : DS_1A1D_RET <0x72, "ds_min_rtn_f64", VReg_64, "ds_min_f64">; -defm DS_MAX_RTN_F64 : DS_1A1D_RET <0x73, "ds_max_rtn_f64", VReg_64, "ds_max_f64">; - -let mayStore = 0 in { -defm DS_READ_B64 : DS_1A_RET <0x76, "ds_read_b64", VReg_64>; -defm DS_READ2_B64 : DS_1A_Off8_RET <0x77, "ds_read2_b64", VReg_128>; -defm DS_READ2ST64_B64 : DS_1A_Off8_RET <0x78, "ds_read2st64_b64", VReg_128>; -} - -defm DS_ADD_SRC2_U32 : DS_1A <0x80, "ds_add_src2_u32">; -defm DS_SUB_SRC2_U32 : DS_1A <0x81, "ds_sub_src2_u32">; -defm DS_RSUB_SRC2_U32 : DS_1A <0x82, "ds_rsub_src2_u32">; -defm DS_INC_SRC2_U32 : DS_1A <0x83, "ds_inc_src2_u32">; -defm DS_DEC_SRC2_U32 : DS_1A <0x84, "ds_dec_src2_u32">; -defm DS_MIN_SRC2_I32 : DS_1A <0x85, "ds_min_src2_i32">; -defm DS_MAX_SRC2_I32 : DS_1A <0x86, "ds_max_src2_i32">; -defm DS_MIN_SRC2_U32 : DS_1A <0x87, "ds_min_src2_u32">; -defm DS_MAX_SRC2_U32 : DS_1A <0x88, "ds_max_src2_u32">; -defm DS_AND_SRC2_B32 : DS_1A <0x89, "ds_and_src_b32">; -defm DS_OR_SRC2_B32 : DS_1A <0x8a, "ds_or_src2_b32">; -defm DS_XOR_SRC2_B32 : DS_1A <0x8b, "ds_xor_src2_b32">; -defm DS_WRITE_SRC2_B32 : DS_1A_Off8_NORET <0x8d, "ds_write_src2_b32">; - -defm DS_MIN_SRC2_F32 : DS_1A <0x92, "ds_min_src2_f32">; -defm DS_MAX_SRC2_F32 : DS_1A <0x93, "ds_max_src2_f32">; - -defm DS_ADD_SRC2_U64 : DS_1A <0xc0, "ds_add_src2_u64">; -defm DS_SUB_SRC2_U64 : DS_1A <0xc1, "ds_sub_src2_u64">; -defm DS_RSUB_SRC2_U64 : DS_1A <0xc2, "ds_rsub_src2_u64">; -defm DS_INC_SRC2_U64 : DS_1A <0xc3, "ds_inc_src2_u64">; -defm DS_DEC_SRC2_U64 : DS_1A <0xc4, "ds_dec_src2_u64">; -defm DS_MIN_SRC2_I64 : DS_1A <0xc5, "ds_min_src2_i64">; -defm DS_MAX_SRC2_I64 : DS_1A <0xc6, "ds_max_src2_i64">; -defm DS_MIN_SRC2_U64 : DS_1A <0xc7, "ds_min_src2_u64">; -defm DS_MAX_SRC2_U64 : DS_1A <0xc8, "ds_max_src2_u64">; -defm DS_AND_SRC2_B64 : DS_1A <0xc9, "ds_and_src2_b64">; -defm DS_OR_SRC2_B64 : DS_1A <0xca, "ds_or_src2_b64">; -defm DS_XOR_SRC2_B64 : DS_1A <0xcb, "ds_xor_src2_b64">; -defm DS_WRITE_SRC2_B64 : DS_1A_Off8_NORET <0xcd, "ds_write_src2_b64">; - -defm DS_MIN_SRC2_F64 : DS_1A <0xd2, "ds_min_src2_f64">; -defm DS_MAX_SRC2_F64 : DS_1A <0xd3, "ds_max_src2_f64">; - -//===----------------------------------------------------------------------===// // MUBUF Instructions //===----------------------------------------------------------------------===// @@ -2361,14 +2200,6 @@ >; //===----------------------------------------------------------------------===// -// DS_SWIZZLE Intrinsic Pattern. -//===----------------------------------------------------------------------===// -def : Pat < - (int_amdgcn_ds_swizzle i32:$src, imm:$offset16), - (DS_SWIZZLE_B32 $src, (as_i16imm $offset16), (i1 0)) ->; - -//===----------------------------------------------------------------------===// // V_ICMPIntrinsic Pattern. //===----------------------------------------------------------------------===// class ICMP_Pattern : Pat < @@ -2432,8 +2263,6 @@ def : FCMP_Pattern ; def : FCMP_Pattern ; def : FCMP_Pattern ; - -//===----------------------------------------------------------------------===// // SMRD Patterns //===----------------------------------------------------------------------===// @@ -3141,98 +2970,6 @@ defm : BFIPatterns ; def : ROTRPattern ; -/********** ======================= **********/ -/********** Load/Store Patterns **********/ -/********** ======================= **********/ - -class DSReadPat : Pat < - (vt (frag (DS1Addr1Offset i32:$ptr, i32:$offset))), - (inst $ptr, (as_i16imm $offset), (i1 0)) ->; - -def : DSReadPat ; -def : DSReadPat ; -def : DSReadPat ; -def : DSReadPat ; -def : DSReadPat ; - -let AddedComplexity = 100 in { - -def : DSReadPat ; - -} // End AddedComplexity = 100 - -def : Pat < - (v2i32 (si_load_local (DS64Bit4ByteAligned i32:$ptr, i8:$offset0, - i8:$offset1))), - (DS_READ2_B32 $ptr, $offset0, $offset1, (i1 0)) ->; - -class DSWritePat : Pat < - (frag vt:$value, (DS1Addr1Offset i32:$ptr, i32:$offset)), - (inst $ptr, $value, (as_i16imm $offset), (i1 0)) ->; - -def : DSWritePat ; -def : DSWritePat ; -def : DSWritePat ; - -let AddedComplexity = 100 in { - -def : DSWritePat ; -} // End AddedComplexity = 100 - -def : Pat < - (si_store_local v2i32:$value, (DS64Bit4ByteAligned i32:$ptr, i8:$offset0, - i8:$offset1)), - (DS_WRITE2_B32 $ptr, (EXTRACT_SUBREG $value, sub0), - (EXTRACT_SUBREG $value, sub1), $offset0, $offset1, - (i1 0)) ->; - -class DSAtomicRetPat : Pat < - (frag (DS1Addr1Offset i32:$ptr, i32:$offset), vt:$value), - (inst $ptr, $value, (as_i16imm $offset), (i1 0)) ->; - -class DSAtomicCmpXChg : Pat < - (frag (DS1Addr1Offset i32:$ptr, i32:$offset), vt:$cmp, vt:$swap), - (inst $ptr, $cmp, $swap, (as_i16imm $offset), (i1 0)) ->; - - -// 32-bit atomics. -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicCmpXChg; - -// 64-bit atomics. -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; -def : DSAtomicRetPat; - -def : DSAtomicCmpXChg; - - //===----------------------------------------------------------------------===// // MUBUF Patterns //===----------------------------------------------------------------------===// Index: llvm/trunk/lib/Target/AMDGPU/VIInstrFormats.td =================================================================== --- llvm/trunk/lib/Target/AMDGPU/VIInstrFormats.td +++ llvm/trunk/lib/Target/AMDGPU/VIInstrFormats.td @@ -11,26 +11,6 @@ // //===----------------------------------------------------------------------===// -class DSe_vi op> : Enc64 { - bits<8> vdst; - bits<1> gds; - bits<8> addr; - bits<8> data0; - bits<8> data1; - bits<8> offset0; - bits<8> offset1; - - let Inst{7-0} = offset0; - let Inst{15-8} = offset1; - let Inst{16} = gds; - let Inst{24-17} = op; - let Inst{31-26} = 0x36; //encoding - let Inst{39-32} = addr; - let Inst{47-40} = data0; - let Inst{55-48} = data1; - let Inst{63-56} = vdst; -} - class MUBUFe_vi op> : Enc64 { bits<12> offset; bits<1> offen; Index: llvm/trunk/lib/Target/AMDGPU/VIInstructions.td =================================================================== --- llvm/trunk/lib/Target/AMDGPU/VIInstructions.td +++ llvm/trunk/lib/Target/AMDGPU/VIInstructions.td @@ -144,15 +144,4 @@ (S_MEMREALTIME) >; -//===----------------------------------------------------------------------===// -// DS_PERMUTE/DS_BPERMUTE Instructions. -//===----------------------------------------------------------------------===// - -let Uses = [EXEC] in { -defm DS_PERMUTE_B32 : DS_1A1D_PERMUTE <0x3e, "ds_permute_b32", VGPR_32, - int_amdgcn_ds_permute>; -defm DS_BPERMUTE_B32 : DS_1A1D_PERMUTE <0x3f, "ds_bpermute_b32", VGPR_32, - int_amdgcn_ds_bpermute>; -} - } // End Predicates = [isVI] Index: llvm/trunk/test/MC/AMDGPU/ds.s =================================================================== --- llvm/trunk/test/MC/AMDGPU/ds.s +++ llvm/trunk/test/MC/AMDGPU/ds.s @@ -270,17 +270,18 @@ // SICI: ds_read_u16 v8, v2 ; encoding: [0x00,0x00,0xf0,0xd8,0x02,0x00,0x00,0x08] // VI: ds_read_u16 v8, v2 ; encoding: [0x00,0x00,0x78,0xd8,0x02,0x00,0x00,0x08] -ds_consume v8 -// SICI: ds_consume v8 ; encoding: [0x00,0x00,0xf4,0xd8,0x00,0x00,0x00,0x08] -// VI: ds_consume v8 ; encoding: [0x00,0x00,0x7a,0xd8,0x00,0x00,0x00,0x08] - -ds_append v8 -// SICI: ds_append v8 ; encoding: [0x00,0x00,0xf8,0xd8,0x00,0x00,0x00,0x08] -// VI: ds_append v8 ; encoding: [0x00,0x00,0x7c,0xd8,0x00,0x00,0x00,0x08] - -ds_ordered_count v8, v2 gds -// SICI: ds_ordered_count v8, v2 gds ; encoding: [0x00,0x00,0xfe,0xd8,0x02,0x00,0x00,0x08] -// VI: ds_ordered_count v8, v2 gds ; encoding: [0x00,0x00,0x7f,0xd8,0x02,0x00,0x00,0x08] + +//ds_consume v8 +// FIXMESICI: ds_consume v8 ; encoding: [0x00,0x00,0xf4,0xd8,0x00,0x00,0x00,0x08] +// FIXMEVI: ds_consume v8 ; encoding: [0x00,0x00,0x7a,0xd8,0x00,0x00,0x00,0x08] + +//ds_append v8 +// FIXMESICI: ds_append v8 ; encoding: [0x00,0x00,0xf8,0xd8,0x00,0x00,0x00,0x08] +// FIXMEVI: ds_append v8 ; encoding: [0x00,0x00,0x7c,0xd8,0x00,0x00,0x00,0x08] + +//ds_ordered_count v8, v2 gds +// FIXMESICI: ds_ordered_count v8, v2 gds ; encoding: [0x00,0x00,0xfe,0xd8,0x02,0x00,0x00,0x08] +// FIXMEVI: ds_ordered_count v8, v2 gds ; encoding: [0x00,0x00,0x7f,0xd8,0x02,0x00,0x00,0x08] ds_add_u64 v2, v[4:5] // SICI: ds_add_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x00,0xd9,0x02,0x04,0x00,0x00] Index: llvm/trunk/test/MC/Disassembler/AMDGPU/ds_vi.txt =================================================================== --- llvm/trunk/test/MC/Disassembler/AMDGPU/ds_vi.txt +++ llvm/trunk/test/MC/Disassembler/AMDGPU/ds_vi.txt @@ -186,15 +186,6 @@ # VI: ds_read_u16 v8, v2 ; encoding: [0x00,0x00,0x78,0xd8,0x02,0x00,0x00,0x08] 0x00 0x00 0x78 0xd8 0x02 0x00 0x00 0x08 -# VI: ds_consume v8 ; encoding: [0x00,0x00,0x7a,0xd8,0x00,0x00,0x00,0x08] -0x00 0x00 0x7a 0xd8 0x00 0x00 0x00 0x08 - -# FIXME: ds_append v8 ; encoding: [0x00,0x00,0x7c,0xd8,0x00,0x00,0x00,0x08] -0x00 0x00 0x7c 0xd8 0x00 0x00 0x00 0x08 - -# VI: ds_ordered_count v8, v2 gds ; encoding: [0x00,0x00,0x7f,0xd8,0x02,0x00,0x00,0x08] -0x00 0x00 0x7f 0xd8 0x02 0x00 0x00 0x08 - # VI: ds_add_u64 v2, v[4:5] ; encoding: [0x00,0x00,0x80,0xd8,0x02,0x04,0x00,0x00] 0x00 0x00 0x80 0xd8 0x02 0x04 0x00 0x00