add some rules

Author: lxq015

src/cmd/compile/internal/ssa/_gen/RISCV64.rules

@@ -853,3 +853,9 @@
 // Zicond Extension for Integer Conditional Operations
 // General lowering rule: always lower CondSelect to OR(CZEROEQZ, CZERONEZ) form
 (CondSelect <t> x y cond) && buildcfg.GORISCV64 >= 23 => (OR (CZEROEQZ <t> x cond) (CZERONEZ <t> y cond))
+(CZERO(EQ|NE)Z <t> x (SNEZ y)) => (CZERO(EQ|NE)Z <t> x y)
+(CZERO(EQ|NE)Z <t> x (SEQZ y)) => (CZERO(NE|EQ)Z <t> x y)
+(CZEROEQZ <t> x x) => x
+(CZERONEZ <t> x x) => (MOVDconst <t> [0])
+(CZERO(EQ|NE)Z <t> (MOVDconst [0]) _) => (MOVDconst <t> [0])
+(OR (MOVDconst [0]) x) => x

src/cmd/compile/internal/ssa/_gen/RISCV64latelower.rules

@@ -27,49 +27,34 @@
 // "Zicond" Extension for Integer Conditional Operations
 // Optimize specific patterns based on the unified OR(CZEROEQZ, CZERONEZ) form
 // (x == 0) ? x : y -> CZEROEQZ y x (when x is the condition)
-(OR (CZEROEQZ <t> x (SEQZ x)) (CZERONEZ <t> y (SEQZ x))) && buildcfg.GORISCV64 >= 23 => (CZEROEQZ <t> y x)
+(OR (CZERONEZ <t> x x) (CZEROEQZ <t> y x)) => (CZEROEQZ <t> y x)
 
 // (z == 0) ? ((OP x y)) : x  =>  (OP x (CZERONEZ y z))
-(OR (CZEROEQZ <t> ((ADD|SUB|OR|XOR|SUBW) x y) (SEQZ z)) (CZERONEZ <t> x (SEQZ z))) && buildcfg.GORISCV64 >= 23
-  => ((ADD|SUB|OR|XOR|SUBW) x (CZERONEZ <t> y z))
+(OR (CZERONEZ <t> ((ADD|SUB|OR|XOR|SUBW) x y) z) (CZEROEQZ <t> x z)) => ((ADD|SUB|OR|XOR|SUBW) x (CZERONEZ <t> y z))
 // (z != 0) ? ((OP x y)) : x  =>  (OP x (CZEROEQZ y z))
-(OR (CZEROEQZ <t> ((ADD|SUB|OR|XOR|SUBW) x y) (SNEZ z)) (CZERONEZ <t> x (SNEZ z))) && buildcfg.GORISCV64 >= 23
-  => ((ADD|SUB|OR|XOR|SUBW) x (CZEROEQZ <t> y z))
+(OR (CZEROEQZ <t> ((ADD|SUB|OR|XOR|SUBW) x y) z) (CZERONEZ <t> x z)) => ((ADD|SUB|OR|XOR|SUBW) x (CZEROEQZ <t> y z))
 
 // (z == 0) ? (x & y) : x  =>  OR(AND x y, CZEROEQZ x z)
-(OR (CZEROEQZ <t> (AND x y) (SEQZ z)) (CZERONEZ <t> x (SEQZ z))) && buildcfg.GORISCV64 >= 23
-  => (OR (AND <t> x y) (CZEROEQZ <t> x z))
+(OR (CZERONEZ <t> (AND x y) z) (CZEROEQZ <t> x z)) => (OR (AND <t> x y) (CZEROEQZ <t> x z))
 // (z != 0) ? (x & y) : x  =>  OR(AND x y, CZERONEZ x z)
-(OR (CZEROEQZ <t> (AND x y) (SNEZ z)) (CZERONEZ <t> x (SNEZ z))) && buildcfg.GORISCV64 >= 23
-  => (OR (AND <t> x y) (CZERONEZ <t> x z))
+(OR (CZEROEQZ <t> (AND x y) z) (CZERONEZ <t> x z)) => (OR (AND <t> x y) (CZERONEZ <t> x z))
 
 // (z == 0) ? (x & c) : x  =>  OR(AND x c, CZEROEQZ x z)
-(OR (CZEROEQZ <t> (ANDI [c] x) (SEQZ z)) (CZERONEZ <t> x (SEQZ z))) && buildcfg.GORISCV64 >= 23
-  => (OR (AND <t> x (MOVDconst [c])) (CZEROEQZ <t> x z))
+(OR (CZERONEZ <t> (ANDI [c] x) z) (CZEROEQZ <t> x z)) => (OR (AND <t> x (MOVDconst [c])) (CZEROEQZ <t> x z))
 // (z != 0) ? (x & c) : x  =>  OR(AND x c, CZERONEZ x z)
-(OR (CZEROEQZ <t> (ANDI [c] x) (SNEZ z)) (CZERONEZ <t> x (SNEZ z))) && buildcfg.GORISCV64 >= 23
-  => (OR (AND <t> x (MOVDconst [c])) (CZERONEZ <t> x z))
+(OR (CZEROEQZ <t> (ANDI [c] x) z) (CZERONEZ <t> x z)) => (OR (AND <t> x (MOVDconst [c])) (CZERONEZ <t> x z))
 
 // (z == 0) ? ((OPI [c] x)) : x  =>  (OP x (CZERONEZ c z))
-(OR (CZEROEQZ <t> ((ADDI|ORI|XORI) [c] x) (SEQZ z)) (CZERONEZ <t> x (SEQZ z))) && buildcfg.GORISCV64 >= 23
-  => ((ADD|OR|XOR) x (CZERONEZ <t> (MOVDconst [c]) z))
+(OR (CZERONEZ <t> ((ADDI|ORI|XORI) [c] x) z) (CZEROEQZ <t> x z)) => ((ADD|OR|XOR) x (CZERONEZ <t> (MOVDconst [c]) z))
 // (z != 0) ? ((OPI [c] x)) : x  =>  (OP x (CZEROEQZ c z))
-(OR (CZEROEQZ <t> ((ADDI|ORI|XORI) [c] x) (SNEZ z)) (CZERONEZ <t> x (SNEZ z))) && buildcfg.GORISCV64 >= 23
-  => ((ADD|OR|XOR) x (CZEROEQZ <t> (MOVDconst [c]) z))
+(OR (CZEROEQZ <t> ((ADDI|ORI|XORI) [c] x) z) (CZERONEZ <t> x z)) => ((ADD|OR|XOR) x (CZEROEQZ <t> (MOVDconst [c]) z))
 
 // (z == 0) ? (ADDIW [c] x) : x
-(OR (CZEROEQZ <t> (ADDIW [c] x) (SEQZ z)) (CZERONEZ <t> x (SEQZ z))) && buildcfg.GORISCV64 >= 23
-  => (ADD x (CZERONEZ <t> (MOVDconst [int64(int32(c))]) z))
+(OR (CZERONEZ <t> (ADDIW [c] x) z) (CZEROEQZ <t> x z)) => (ADD x (CZERONEZ <t> (MOVDconst [int64(int32(c))]) z))
 // (z != 0) ? (ADDIW [c] x) : x
-(OR (CZEROEQZ <t> (ADDIW [c] x) (SNEZ z)) (CZERONEZ <t> x (SNEZ z))) && buildcfg.GORISCV64 >= 23
-  => (ADD x (CZEROEQZ <t> (MOVDconst [int64(int32(c))]) z))
+(OR (CZEROEQZ <t> (ADDIW [c] x) z) (CZERONEZ <t> x z)) => (ADD x (CZEROEQZ <t> (MOVDconst [int64(int32(c))]) z))
 
 // (cond == 0) ? 0 : const  =>  CZERONEZ const cond
-(OR (CZEROEQZ <t> (MOVDconst [0]) (SEQZ cond)) (CZERONEZ <t> (MOVDconst [c]) (SEQZ cond))) && buildcfg.GORISCV64 >= 23
-  => (CZERONEZ <t> (MOVDconst [c]) cond)
+(OR (CZERONEZ <t> (MOVDconst [0]) cond) (CZEROEQZ <t> (MOVDconst [c]) cond)) => (CZERONEZ <t> (MOVDconst [c]) cond)
 // (cond != 0) ? 0 : const  =>  CZEROEQZ const cond
-(OR (CZEROEQZ <t> (MOVDconst [0]) (SNEZ cond)) (CZERONEZ <t> (MOVDconst [c]) (SNEZ cond))) && buildcfg.GORISCV64 >= 23
-  => (CZEROEQZ <t> (MOVDconst [c]) cond)
-
-// Constant propagation through CZERO(EQ|NE)Z
-(CZERO(EQ|NE)Z <t> (MOVDconst [0]) _) && buildcfg.GORISCV64 >= 23 => (MOVDconst <t> [0])
+(OR (CZEROEQZ <t> (MOVDconst [0]) cond) (CZERONEZ <t> (MOVDconst [c]) cond)) => (CZEROEQZ <t> (MOVDconst [c]) cond)