[llvm] r223721 - R600/SI: Move setting of the lds bit to the base MUBUF class

[Marek Olšák]

LGTM.

Marek

On Tue, Dec 9, 2014 at 1:03 AM, Tom Stellard <thomas.stellard at amd.com> wrote:
> Author: tstellar
> Date: Mon Dec  8 18:03:51 2014
> New Revision: 223721
>
> URL: http://llvm.org/viewvc/llvm-project?rev=223721&view=rev
> Log:
> R600/SI: Move setting of the lds bit to the base MUBUF class
>
> Modified:
>     llvm/trunk/lib/Target/R600/SIInstrInfo.td
>
> Modified: llvm/trunk/lib/Target/R600/SIInstrInfo.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/SIInstrInfo.td?rev=223721&r1=223720&r2=223721&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/R600/SIInstrInfo.td (original)
> +++ llvm/trunk/lib/Target/R600/SIInstrInfo.td Mon Dec  8 18:03:51 2014
> @@ -1520,10 +1520,14 @@ multiclass MTBUF_Load_Helper <bits<3> op
>  //===----------------------------------------------------------------------===//
>
>  class MUBUF_si <bits<7> op, dag outs, dag ins, string asm, list<dag> pattern> :
> -  MUBUF <outs, ins, asm, pattern>, MUBUFe <op>;
> +  MUBUF <outs, ins, asm, pattern>, MUBUFe <op> {
> +  let lds  = 0;
> +}
>
>  class MUBUF_vi <bits<7> op, dag outs, dag ins, string asm, list<dag> pattern> :
> -  MUBUF <outs, ins, asm, pattern>, MUBUFe_vi <op>;
> +  MUBUF <outs, ins, asm, pattern>, MUBUFe_vi <op> {
> +  let lds = 0;
> +}
>
>  class MUBUFAddr64Table <bit is_addr64, string suffix = ""> {
>
> @@ -1609,7 +1613,7 @@ multiclass MUBUF_Load_Helper <bits<7> op
>                                ValueType load_vt = i32,
>                                SDPatternOperator ld = null_frag> {
>
> -  let lds = 0, mayLoad = 1 in {
> +  let mayLoad = 1 in {
>
>      let addr64 = 0 in {
>
> @@ -1704,7 +1708,7 @@ multiclass MUBUF_Load_Helper_vi <bits<7>
>  multiclass MUBUF_Store_Helper <bits<7> op, string name, RegisterClass vdataClass,
>                            ValueType store_vt, SDPatternOperator st> {
>
> -  let addr64 = 0, lds = 0 in {
> +  let addr64 = 0 in {
>
>      def "" : MUBUF_si <
>        op, (outs),
> @@ -1739,7 +1743,7 @@ multiclass MUBUF_Store_Helper <bits<7> o
>        >;
>      } // end offen = 1, idxen = 0
>
> -  } // End addr64 = 0, lds = 0
> +  } // End addr64 = 0
>
>    def _ADDR64 : MUBUF_si <
>      op, (outs),
> @@ -1757,7 +1761,6 @@ multiclass MUBUF_Store_Helper <bits<7> o
>        let idxen = 0;
>        let glc = 0;
>        let addr64 = 1;
> -      let lds = 0;
>        let slc = 0;
>        let tfe = 0;
>        let soffset = 128; // ZERO
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits