[llvm] r229134 - R600/SI: Minor test scheduling fixes

[Matt Arsenault]

Author: arsenm
Date: Fri Feb 13 13:04:56 2015
New Revision: 229134

URL: http://llvm.org/viewvc/llvm-project?rev=229134&view=rev
Log:
R600/SI: Minor test scheduling fixes

This prevents these from failing in a later commit.

Modified:
    llvm/trunk/test/CodeGen/R600/fceil64.ll
    llvm/trunk/test/CodeGen/R600/ffloor.f64.ll
    llvm/trunk/test/CodeGen/R600/llvm.round.f64.ll
    llvm/trunk/test/CodeGen/R600/sign_extend.ll

Modified: llvm/trunk/test/CodeGen/R600/fceil64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/R600/fceil64.ll?rev=229134&r1=229133&r2=229134&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/R600/fceil64.ll (original)
+++ llvm/trunk/test/CodeGen/R600/fceil64.ll Fri Feb 13 13:04:56 2015
@@ -23,8 +23,8 @@ declare <16 x double> @llvm.ceil.v16f64(
 ; SI: cmp_gt_i32
 ; SI: cndmask_b32
 ; SI: cndmask_b32
-; SI: v_cmp_gt_f64
-; SI: v_cmp_lg_f64
+; SI-DAG: v_cmp_gt_f64
+; SI-DAG: v_cmp_lg_f64
 ; SI: s_and_b64
 ; SI: v_cndmask_b32
 ; SI: v_cndmask_b32

Modified: llvm/trunk/test/CodeGen/R600/ffloor.f64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/R600/ffloor.f64.ll?rev=229134&r1=229133&r2=229134&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/R600/ffloor.f64.ll (original)
+++ llvm/trunk/test/CodeGen/R600/ffloor.f64.ll Fri Feb 13 13:04:56 2015
@@ -24,11 +24,11 @@ declare <16 x double> @llvm.floor.v16f64
 ; SI: cmp_gt_i32
 ; SI: cndmask_b32
 ; SI: cndmask_b32
-; SI: v_cmp_lt_f64
-; SI: v_cmp_lg_f64
-; SI: s_and_b64
-; SI: v_cndmask_b32
-; SI: v_cndmask_b32
+; SI-DAG: v_cmp_lt_f64
+; SI-DAG: v_cmp_lg_f64
+; SI-DAG: s_and_b64
+; SI-DAG: v_cndmask_b32
+; SI-DAG: v_cndmask_b32
 ; SI: v_add_f64
 ; SI: s_endpgm
 define void @ffloor_f64(double addrspace(1)* %out, double %x) {

Modified: llvm/trunk/test/CodeGen/R600/llvm.round.f64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/R600/llvm.round.f64.ll?rev=229134&r1=229133&r2=229134&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/R600/llvm.round.f64.ll (original)
+++ llvm/trunk/test/CodeGen/R600/llvm.round.f64.ll Fri Feb 13 13:04:56 2015
@@ -15,16 +15,16 @@ define void @round_f64(double addrspace(
 ; SI: buffer_load_dwordx2
 ; SI: v_bfe_u32 [[EXP:v[0-9]+]], v{{[0-9]+}}, 20, 11
 
-; SI: v_not_b32_e32
-; SI: v_not_b32_e32
+; SI-DAG: v_not_b32_e32
+; SI-DAG: v_not_b32_e32
 
-; SI: v_cmp_eq_i32
+; SI-DAG: v_cmp_eq_i32
 
-; SI: s_mov_b32 [[BFIMASK:s[0-9]+]], 0x7fffffff
-; SI: v_cmp_lt_i32_e64
-; SI: v_bfi_b32 [[COPYSIGN:v[0-9]+]], [[BFIMASK]]
+; SI-DAG: s_mov_b32 [[BFIMASK:s[0-9]+]], 0x7fffffff
+; SI-DAG: v_cmp_lt_i32_e64
+; SI-DAG: v_bfi_b32 [[COPYSIGN:v[0-9]+]], [[BFIMASK]]
 
-; SI: v_cmp_gt_i32_e64
+; SI-DAG: v_cmp_gt_i32_e64
 
 
 ; SI: buffer_store_dwordx2

Modified: llvm/trunk/test/CodeGen/R600/sign_extend.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/R600/sign_extend.ll?rev=229134&r1=229133&r2=229134&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/R600/sign_extend.ll (original)
+++ llvm/trunk/test/CodeGen/R600/sign_extend.ll Fri Feb 13 13:04:56 2015
@@ -24,8 +24,9 @@ entry:
 }
 
 ; SI-LABEL: {{^}}s_sext_i1_to_i64:
-; SI: v_cndmask_b32_e64
-; SI: v_cndmask_b32_e64
+; SI: v_cndmask_b32_e64 v[[LOREG:[0-9]+]], 0, -1, vcc
+; SI: v_mov_b32_e32 v[[HIREG:[0-9]+]], v[[LOREG]]
+; SI: buffer_store_dwordx2 v{{\[}}[[LOREG]]:[[HIREG]]{{\]}}
 ; SI: s_endpgm
 define void @s_sext_i1_to_i64(i64 addrspace(1)* %out, i32 %a, i32 %b) nounwind {
   %cmp = icmp eq i32 %a, %b