[llvm] 5759508 - fix revert b0b3f82dd3c00cdba891f1ff6ba63abd419d0f18
Zequan Wu via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 1 14:01:50 PDT 2023
Author: Zequan Wu
Date: 2023-09-01T17:01:43-04:00
New Revision: 57595086db5c9180bf6a248ed90f8e83a2c66752
URL: https://github.com/llvm/llvm-project/commit/57595086db5c9180bf6a248ed90f8e83a2c66752
DIFF: https://github.com/llvm/llvm-project/commit/57595086db5c9180bf6a248ed90f8e83a2c66752.diff
LOG: fix revert b0b3f82dd3c00cdba891f1ff6ba63abd419d0f18
Added:
Modified:
llvm/test/CodeGen/X86/movmsk-cmp.ll
llvm/test/CodeGen/X86/pr33349.ll
llvm/test/CodeGen/X86/pr34177.ll
Removed:
################################################################################
diff --git a/llvm/test/CodeGen/X86/movmsk-cmp.ll b/llvm/test/CodeGen/X86/movmsk-cmp.ll
index f90fa4482a9d90..88d819d6106ea9 100644
--- a/llvm/test/CodeGen/X86/movmsk-cmp.ll
+++ b/llvm/test/CodeGen/X86/movmsk-cmp.ll
@@ -4353,11 +4353,7 @@ define i32 @PR39665_c_ray(<2 x double> %x, <2 x double> %y) {
; KNL-NEXT: kshiftrw $1, %k0, %k1
; KNL-NEXT: kmovw %k1, %eax
; KNL-NEXT: kmovw %k0, %ecx
-<<<<<<< HEAD
-; KNL-NEXT: testb $2, %cl
-=======
; KNL-NEXT: testb $1, %al
->>>>>>> parent of 239ab16ec121 ([X86] combineCMP - attempt to simplify KSHIFTR mask element extractions when just comparing against zero)
; KNL-NEXT: movl $42, %eax
; KNL-NEXT: movl $99, %edx
; KNL-NEXT: cmovel %edx, %eax
@@ -4372,11 +4368,7 @@ define i32 @PR39665_c_ray(<2 x double> %x, <2 x double> %y) {
; SKX-NEXT: kshiftrb $1, %k0, %k1
; SKX-NEXT: kmovd %k1, %eax
; SKX-NEXT: kmovd %k0, %ecx
-<<<<<<< HEAD
-; SKX-NEXT: testb $2, %cl
-=======
; SKX-NEXT: testb $1, %al
->>>>>>> parent of 239ab16ec121 ([X86] combineCMP - attempt to simplify KSHIFTR mask element extractions when just comparing against zero)
; SKX-NEXT: movl $42, %eax
; SKX-NEXT: movl $99, %edx
; SKX-NEXT: cmovel %edx, %eax
diff --git a/llvm/test/CodeGen/X86/pr33349.ll b/llvm/test/CodeGen/X86/pr33349.ll
index d7e76ff9f19d61..5addaca47c86ee 100644
--- a/llvm/test/CodeGen/X86/pr33349.ll
+++ b/llvm/test/CodeGen/X86/pr33349.ll
@@ -22,12 +22,8 @@ target triple = "x86_64-unknown-linux-gnu"
; KNL-NEXT: testb $1, %al
; KNL-NEXT: fld %st(1)
; KNL-NEXT: fcmovne %st(3), %st
-<<<<<<< HEAD
-; KNL-NEXT: kmovw %k0, %eax
-=======
; KNL-NEXT: kshiftrw $1, %k0, %k1
; KNL-NEXT: kmovw %k1, %eax
->>>>>>> parent of 239ab16ec121 ([X86] combineCMP - attempt to simplify KSHIFTR mask element extractions when just comparing against zero)
; KNL-NEXT: testb $1, %al
; KNL-NEXT: fld %st(2)
; KNL-NEXT: fcmovne %st(4), %st
@@ -62,12 +58,8 @@ target triple = "x86_64-unknown-linux-gnu"
; SKX-NEXT: testb $1, %al
; SKX-NEXT: fld %st(1)
; SKX-NEXT: fcmovne %st(3), %st
-<<<<<<< HEAD
-; SKX-NEXT: kmovd %k0, %eax
-=======
; SKX-NEXT: kshiftrb $1, %k0, %k1
; SKX-NEXT: kmovd %k1, %eax
->>>>>>> parent of 239ab16ec121 ([X86] combineCMP - attempt to simplify KSHIFTR mask element extractions when just comparing against zero)
; SKX-NEXT: testb $1, %al
; SKX-NEXT: fld %st(2)
; SKX-NEXT: fcmovne %st(4), %st
diff --git a/llvm/test/CodeGen/X86/pr34177.ll b/llvm/test/CodeGen/X86/pr34177.ll
index 6dc4ee7a831809..2653fcdcb75cad 100644
--- a/llvm/test/CodeGen/X86/pr34177.ll
+++ b/llvm/test/CodeGen/X86/pr34177.ll
@@ -49,16 +49,10 @@ define void @test(<4 x i64> %a, <4 x x86_fp80> %b, ptr %c) local_unnamed_addr {
; AVX512VL-LABEL: test:
; AVX512VL: # %bb.0:
; AVX512VL-NEXT: vpcmpeqq {{\.?LCPI[0-9]+_[0-9]+}}(%rip), %ymm0, %k0
-<<<<<<< HEAD
-; AVX512VL-NEXT: kshiftrb $2, %k0, %k1
-; AVX512VL-NEXT: kmovd %k0, %eax
-; AVX512VL-NEXT: testb $2, %al
-=======
; AVX512VL-NEXT: kshiftrb $1, %k0, %k1
; AVX512VL-NEXT: kshiftrb $2, %k0, %k2
; AVX512VL-NEXT: kmovd %k0, %eax
; AVX512VL-NEXT: testb $1, %al
->>>>>>> parent of 239ab16ec121 ([X86] combineCMP - attempt to simplify KSHIFTR mask element extractions when just comparing against zero)
; AVX512VL-NEXT: fld1
; AVX512VL-NEXT: fldz
; AVX512VL-NEXT: fld %st(0)
@@ -67,14 +61,9 @@ define void @test(<4 x i64> %a, <4 x x86_fp80> %b, ptr %c) local_unnamed_addr {
; AVX512VL-NEXT: testb $1, %al
; AVX512VL-NEXT: fld %st(1)
; AVX512VL-NEXT: fcmovne %st(3), %st
-<<<<<<< HEAD
-; AVX512VL-NEXT: kmovd %k1, %eax
-; AVX512VL-NEXT: testb $2, %al
-=======
; AVX512VL-NEXT: kshiftrb $1, %k2, %k0
; AVX512VL-NEXT: kmovd %k0, %eax
; AVX512VL-NEXT: testb $1, %al
->>>>>>> parent of 239ab16ec121 ([X86] combineCMP - attempt to simplify KSHIFTR mask element extractions when just comparing against zero)
; AVX512VL-NEXT: fld %st(2)
; AVX512VL-NEXT: fcmovne %st(4), %st
; AVX512VL-NEXT: kmovd %k2, %eax
More information about the llvm-commits
mailing list