From 67eb161d04d59a9885be1435bea70a9575542fee Mon Sep 17 00:00:00 2001 From: Chris Fallin Date: Tue, 10 May 2022 10:56:54 -0700 Subject: [PATCH] Cranelift: fix filetest now failing after merge to main. (#4120) This test was added between the last CI run on #4088 and its merge to main, and the changes in #4088 (use of constants directly in instruction via load from constant pool, rather than from a register initialized by a separate instruction) cause it to fail now. This PR alters the test to be invariant to regalloc and argument decisions during lowering, as the test is really checking (per the comment) that we get two cmoves without an intervening move. As such, it just matches the instruction opcodes, irrespective of the arguments. --- .../filetests/filetests/isa/x64/select-issue-3744.clif | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cranelift/filetests/filetests/isa/x64/select-issue-3744.clif b/cranelift/filetests/filetests/isa/x64/select-issue-3744.clif index 251ea4583b..2e50d6c0a3 100644 --- a/cranelift/filetests/filetests/isa/x64/select-issue-3744.clif +++ b/cranelift/filetests/filetests/isa/x64/select-issue-3744.clif @@ -9,8 +9,8 @@ block0(v0: f32, v1: f32): v3 = iconst.i32 1 v4 = iconst.i32 0 v5 = select v2, v3, v4 - ; check: ucomiss %xmm0, %xmm1 - ; nextln: cmovnzl %r8d, %eax, %eax - ; nextln: cmovpl %r8d, %eax, %eax + ; check: ucomiss + ; nextln: cmovnzl + ; nextln: cmovpl return v5 }