[PATCH] R600/SI: Specify S_ADD/S_SUB set SCC and add is commutable

[Tom Stellard]

On Tue, Oct 22, 2013 at 11:45:12AM -0700, Matt Arsenault wrote:
> http://llvm-reviews.chandlerc.com/D2001
> 
> Files:
>   lib/Target/R600/SIInstructions.td
> 
> Index: lib/Target/R600/SIInstructions.td
> ===================================================================
> --- lib/Target/R600/SIInstructions.td
> +++ lib/Target/R600/SIInstructions.td
> @@ -1123,17 +1123,29 @@
>  //def V_QSAD_U8 : VOP3_U8 <0x00000172, "V_QSAD_U8", []>;
>  //def V_MQSAD_U8 : VOP3_U8 <0x00000173, "V_MQSAD_U8", []>;
>  def V_TRIG_PREOP_F64 : VOP3_64 <0x00000174, "V_TRIG_PREOP_F64", []>;
> -def S_ADD_U32 : SOP2_32 <0x00000000, "S_ADD_U32", []>;
> -def S_SUB_U32 : SOP2_32 <0x00000001, "S_SUB_U32", []>;
> -def S_ADD_I32 : SOP2_32 <0x00000002, "S_ADD_I32",
> -  [(set i32:$dst, (add i32:$src0, i32:$src1))]
> ->;
> -def S_SUB_I32 : SOP2_32 <0x00000003, "S_SUB_I32",
> -  [(set i32:$dst, (sub i32:$src0, i32:$src1))]
> ->;
>  
> -def S_ADDC_U32 : SOP2_32 <0x00000004, "S_ADDC_U32", []>;
> -def S_SUBB_U32 : SOP2_32 <0x00000005, "S_SUBB_U32", []>;
> +let Defs = [SCC] in { // Carry out goes to SCC
> +  let isCommutable = 1 in {
> +    def S_ADD_U32 : SOP2_32 <0x00000000, "S_ADD_U32", []>;
> +    def S_ADD_I32 : SOP2_32 <0x00000002, "S_ADD_I32",
> +      [(set i32:$dst, (add i32:$src0, i32:$src1))]
> +    >;

The convention we've been using is to not indent code inside of let
blocks.

> +  }
> +

We also terminate let blocks with a comment like this:

} // End isCommutable = 1

> +  def S_SUB_U32 : SOP2_32 <0x00000001, "S_SUB_U32", []>;
> +  def S_SUB_I32 : SOP2_32 <0x00000003, "S_SUB_I32",
> +    [(set i32:$dst, (sub i32:$src0, i32:$src1))]
> +  >;
> +
> +  let Uses = [SCC] in { // Carry in comes from SCC
> +    let isCommutable = 1 in {
> +      def S_ADDC_U32 : SOP2_32 <0x00000004, "S_ADDC_U32", []>;
> +    }
> +
> +    def S_SUBB_U32 : SOP2_32 <0x00000005, "S_SUBB_U32", []>;
> +  }
> +}
> +
>  def S_MIN_I32 : SOP2_32 <0x00000006, "S_MIN_I32", []>;
>  def S_MIN_U32 : SOP2_32 <0x00000007, "S_MIN_U32", []>;
>  def S_MAX_I32 : SOP2_32 <0x00000008, "S_MAX_I32", []>;

> Index: lib/Target/R600/SIInstructions.td
> ===================================================================
> --- lib/Target/R600/SIInstructions.td
> +++ lib/Target/R600/SIInstructions.td
> @@ -1123,17 +1123,29 @@
>  //def V_QSAD_U8 : VOP3_U8 <0x00000172, "V_QSAD_U8", []>;
>  //def V_MQSAD_U8 : VOP3_U8 <0x00000173, "V_MQSAD_U8", []>;
>  def V_TRIG_PREOP_F64 : VOP3_64 <0x00000174, "V_TRIG_PREOP_F64", []>;
> -def S_ADD_U32 : SOP2_32 <0x00000000, "S_ADD_U32", []>;
> -def S_SUB_U32 : SOP2_32 <0x00000001, "S_SUB_U32", []>;
> -def S_ADD_I32 : SOP2_32 <0x00000002, "S_ADD_I32",
> -  [(set i32:$dst, (add i32:$src0, i32:$src1))]
> ->;
> -def S_SUB_I32 : SOP2_32 <0x00000003, "S_SUB_I32",
> -  [(set i32:$dst, (sub i32:$src0, i32:$src1))]
> ->;
>  
> -def S_ADDC_U32 : SOP2_32 <0x00000004, "S_ADDC_U32", []>;
> -def S_SUBB_U32 : SOP2_32 <0x00000005, "S_SUBB_U32", []>;
> +let Defs = [SCC] in { // Carry out goes to SCC
> +  let isCommutable = 1 in {
> +    def S_ADD_U32 : SOP2_32 <0x00000000, "S_ADD_U32", []>;
> +    def S_ADD_I32 : SOP2_32 <0x00000002, "S_ADD_I32",
> +      [(set i32:$dst, (add i32:$src0, i32:$src1))]
> +    >;
> +  }
> +
> +  def S_SUB_U32 : SOP2_32 <0x00000001, "S_SUB_U32", []>;
> +  def S_SUB_I32 : SOP2_32 <0x00000003, "S_SUB_I32",
> +    [(set i32:$dst, (sub i32:$src0, i32:$src1))]
> +  >;
> +
> +  let Uses = [SCC] in { // Carry in comes from SCC
> +    let isCommutable = 1 in {
> +      def S_ADDC_U32 : SOP2_32 <0x00000004, "S_ADDC_U32", []>;
> +    }
> +
> +    def S_SUBB_U32 : SOP2_32 <0x00000005, "S_SUBB_U32", []>;
> +  }
> +}
> +
>  def S_MIN_I32 : SOP2_32 <0x00000006, "S_MIN_I32", []>;
>  def S_MIN_U32 : SOP2_32 <0x00000007, "S_MIN_U32", []>;
>  def S_MAX_I32 : SOP2_32 <0x00000008, "S_MAX_I32", []>;

> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits