From db8a16252b9d29bd7a3442d5c3bad0398dd85908 Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Thu, 17 Oct 2013 12:16:03 +0000 Subject: [PATCH] [mips][msa] Removed ldx.[bhwd] and stx.[bhwd]. These were present in a previous version of the MSA spec but are not present in the published version. There is no hardware that uses these instructions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192888 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/IR/IntrinsicsMips.td | 26 ------------- lib/Target/Mips/MipsMSAInstrInfo.td | 51 -------------------------- lib/Target/Mips/MipsSEISelLowering.cpp | 8 ---- 3 files changed, 85 deletions(-) diff --git a/include/llvm/IR/IntrinsicsMips.td b/include/llvm/IR/IntrinsicsMips.td index 5d8a7be7947..4824ae55708 100644 --- a/include/llvm/IR/IntrinsicsMips.td +++ b/include/llvm/IR/IntrinsicsMips.td @@ -1242,19 +1242,6 @@ def int_mips_ld_d : GCCBuiltin<"__builtin_msa_ld_d">, Intrinsic<[llvm_v2i64_ty], [llvm_ptr_ty, llvm_i32_ty], [IntrReadArgMem]>; -def int_mips_ldx_b : GCCBuiltin<"__builtin_msa_ldx_b">, - Intrinsic<[llvm_v16i8_ty], [llvm_ptr_ty, llvm_i32_ty], - [IntrReadArgMem]>; -def int_mips_ldx_h : GCCBuiltin<"__builtin_msa_ldx_h">, - Intrinsic<[llvm_v8i16_ty], [llvm_ptr_ty, llvm_i32_ty], - [IntrReadArgMem]>; -def int_mips_ldx_w : GCCBuiltin<"__builtin_msa_ldx_w">, - Intrinsic<[llvm_v4i32_ty], [llvm_ptr_ty, llvm_i32_ty], - [IntrReadArgMem]>; -def int_mips_ldx_d : GCCBuiltin<"__builtin_msa_ldx_d">, - Intrinsic<[llvm_v2i64_ty], [llvm_ptr_ty, llvm_i32_ty], - [IntrReadArgMem]>; - def int_mips_ldi_b : GCCBuiltin<"__builtin_msa_ldi_b">, Intrinsic<[llvm_v16i8_ty], [llvm_i32_ty], [IntrNoMem]>; def int_mips_ldi_h : GCCBuiltin<"__builtin_msa_ldi_h">, @@ -1669,19 +1656,6 @@ def int_mips_st_d : GCCBuiltin<"__builtin_msa_st_d">, Intrinsic<[], [llvm_v2i64_ty, llvm_ptr_ty, llvm_i32_ty], [IntrReadWriteArgMem]>; -def int_mips_stx_b : GCCBuiltin<"__builtin_msa_stx_b">, - Intrinsic<[], [llvm_v16i8_ty, llvm_ptr_ty, llvm_i32_ty], - [IntrReadWriteArgMem]>; -def int_mips_stx_h : GCCBuiltin<"__builtin_msa_stx_h">, - Intrinsic<[], [llvm_v8i16_ty, llvm_ptr_ty, llvm_i32_ty], - [IntrReadWriteArgMem]>; -def int_mips_stx_w : GCCBuiltin<"__builtin_msa_stx_w">, - Intrinsic<[], [llvm_v4i32_ty, llvm_ptr_ty, llvm_i32_ty], - [IntrReadWriteArgMem]>; -def int_mips_stx_d : GCCBuiltin<"__builtin_msa_stx_d">, - Intrinsic<[], [llvm_v2i64_ty, llvm_ptr_ty, llvm_i32_ty], - [IntrReadWriteArgMem]>; - def int_mips_subs_s_b : GCCBuiltin<"__builtin_msa_subs_s_b">, Intrinsic<[llvm_v16i8_ty], [llvm_v16i8_ty, llvm_v16i8_ty], [IntrNoMem]>; def int_mips_subs_s_h : GCCBuiltin<"__builtin_msa_subs_s_h">, diff --git a/lib/Target/Mips/MipsMSAInstrInfo.td b/lib/Target/Mips/MipsMSAInstrInfo.td index 5ddec656cd9..778fda1e649 100644 --- a/lib/Target/Mips/MipsMSAInstrInfo.td +++ b/lib/Target/Mips/MipsMSAInstrInfo.td @@ -762,11 +762,6 @@ class LDI_H_ENC : MSA_I10_FMT<0b010, 0b01, 0b001100>; class LDI_W_ENC : MSA_I10_FMT<0b010, 0b10, 0b001100>; class LDI_D_ENC : MSA_I10_FMT<0b010, 0b11, 0b001100>; -class LDX_B_ENC : MSA_3R_FMT<0b110, 0b00, 0b001111>; -class LDX_H_ENC : MSA_3R_FMT<0b110, 0b01, 0b001111>; -class LDX_W_ENC : MSA_3R_FMT<0b110, 0b10, 0b001111>; -class LDX_D_ENC : MSA_3R_FMT<0b110, 0b11, 0b001111>; - class MADD_Q_H_ENC : MSA_3RF_FMT<0b0101, 0b0, 0b011100>; class MADD_Q_W_ENC : MSA_3RF_FMT<0b0101, 0b1, 0b011100>; @@ -984,11 +979,6 @@ class ST_H_ENC : MSA_I5_FMT<0b111, 0b01, 0b000111>; class ST_W_ENC : MSA_I5_FMT<0b111, 0b10, 0b000111>; class ST_D_ENC : MSA_I5_FMT<0b111, 0b11, 0b000111>; -class STX_B_ENC : MSA_3R_FMT<0b111, 0b00, 0b001111>; -class STX_H_ENC : MSA_3R_FMT<0b111, 0b01, 0b001111>; -class STX_W_ENC : MSA_3R_FMT<0b111, 0b10, 0b001111>; -class STX_D_ENC : MSA_3R_FMT<0b111, 0b11, 0b001111>; - class SUBS_S_B_ENC : MSA_3R_FMT<0b000, 0b00, 0b010001>; class SUBS_S_H_ENC : MSA_3R_FMT<0b000, 0b01, 0b010001>; class SUBS_S_W_ENC : MSA_3R_FMT<0b000, 0b10, 0b010001>; @@ -2048,21 +2038,6 @@ class LDI_H_DESC : MSA_I10_LDI_DESC_BASE<"ldi.h", MSA128H>; class LDI_W_DESC : MSA_I10_LDI_DESC_BASE<"ldi.w", MSA128W>; class LDI_D_DESC : MSA_I10_LDI_DESC_BASE<"ldi.d", MSA128D>; -class LDX_DESC_BASE { - dag OutOperandList = (outs RCWD:$wd); - dag InOperandList = (ins MemOpnd:$addr); - string AsmString = !strconcat(instr_asm, "\t$wd, $addr"); - list Pattern = [(set RCWD:$wd, (TyNode (OpNode Addr:$addr)))]; - InstrItinClass Itinerary = itin; -} - -class LDX_B_DESC : LDX_DESC_BASE<"ldx.b", load, v16i8, MSA128B>; -class LDX_H_DESC : LDX_DESC_BASE<"ldx.h", load, v8i16, MSA128H>; -class LDX_W_DESC : LDX_DESC_BASE<"ldx.w", load, v4i32, MSA128W>; -class LDX_D_DESC : LDX_DESC_BASE<"ldx.d", load, v2i64, MSA128D>; class MADD_Q_H_DESC : MSA_3RF_4RF_DESC_BASE<"madd_q.h", int_mips_madd_q_h, MSA128HOpnd>; @@ -2369,22 +2344,6 @@ class ST_H_DESC : ST_DESC_BASE<"st.h", store, v8i16, MSA128H>; class ST_W_DESC : ST_DESC_BASE<"st.w", store, v4i32, MSA128W>; class ST_D_DESC : ST_DESC_BASE<"st.d", store, v2i64, MSA128D>; -class STX_DESC_BASE { - dag OutOperandList = (outs); - dag InOperandList = (ins RCWD:$wd, MemOpnd:$addr); - string AsmString = !strconcat(instr_asm, "\t$wd, $addr"); - list Pattern = [(OpNode (TyNode RCWD:$wd), Addr:$addr)]; - InstrItinClass Itinerary = itin; -} - -class STX_B_DESC : STX_DESC_BASE<"stx.b", store, v16i8, MSA128B>; -class STX_H_DESC : STX_DESC_BASE<"stx.h", store, v8i16, MSA128H>; -class STX_W_DESC : STX_DESC_BASE<"stx.w", store, v4i32, MSA128W>; -class STX_D_DESC : STX_DESC_BASE<"stx.d", store, v2i64, MSA128D>; - class SUBS_S_B_DESC : MSA_3R_DESC_BASE<"subs_s.b", int_mips_subs_s_b, MSA128BOpnd>; class SUBS_S_H_DESC : MSA_3R_DESC_BASE<"subs_s.h", int_mips_subs_s_h, @@ -2934,11 +2893,6 @@ def LDI_H : LDI_H_ENC, LDI_H_DESC; def LDI_W : LDI_W_ENC, LDI_W_DESC; def LDI_D : LDI_D_ENC, LDI_D_DESC; -def LDX_B: LDX_B_ENC, LDX_B_DESC; -def LDX_H: LDX_H_ENC, LDX_H_DESC; -def LDX_W: LDX_W_ENC, LDX_W_DESC; -def LDX_D: LDX_D_ENC, LDX_D_DESC; - def MADD_Q_H : MADD_Q_H_ENC, MADD_Q_H_DESC; def MADD_Q_W : MADD_Q_W_ENC, MADD_Q_W_DESC; @@ -3180,11 +3134,6 @@ def ST_H: ST_H_ENC, ST_H_DESC; def ST_W: ST_W_ENC, ST_W_DESC; def ST_D: ST_D_ENC, ST_D_DESC; -def STX_B: STX_B_ENC, STX_B_DESC; -def STX_H: STX_H_ENC, STX_H_DESC; -def STX_W: STX_W_ENC, STX_W_DESC; -def STX_D: STX_D_ENC, STX_D_DESC; - def SUBS_S_B : SUBS_S_B_ENC, SUBS_S_B_DESC; def SUBS_S_H : SUBS_S_H_ENC, SUBS_S_H_DESC; def SUBS_S_W : SUBS_S_W_ENC, SUBS_S_W_DESC; diff --git a/lib/Target/Mips/MipsSEISelLowering.cpp b/lib/Target/Mips/MipsSEISelLowering.cpp index c0868722f77..9b23304cbde 100644 --- a/lib/Target/Mips/MipsSEISelLowering.cpp +++ b/lib/Target/Mips/MipsSEISelLowering.cpp @@ -1665,10 +1665,6 @@ SDValue MipsSETargetLowering::lowerINTRINSIC_W_CHAIN(SDValue Op, case Intrinsic::mips_ld_h: case Intrinsic::mips_ld_w: case Intrinsic::mips_ld_d: - case Intrinsic::mips_ldx_b: - case Intrinsic::mips_ldx_h: - case Intrinsic::mips_ldx_w: - case Intrinsic::mips_ldx_d: return lowerMSALoadIntr(Op, DAG, Intr); } } @@ -1697,10 +1693,6 @@ SDValue MipsSETargetLowering::lowerINTRINSIC_VOID(SDValue Op, case Intrinsic::mips_st_h: case Intrinsic::mips_st_w: case Intrinsic::mips_st_d: - case Intrinsic::mips_stx_b: - case Intrinsic::mips_stx_h: - case Intrinsic::mips_stx_w: - case Intrinsic::mips_stx_d: return lowerMSAStoreIntr(Op, DAG, Intr); } }