Index: llvm/test/CodeGen/RISCV/rv32zbs.ll
===================================================================
--- llvm/test/CodeGen/RISCV/rv32zbs.ll
+++ llvm/test/CodeGen/RISCV/rv32zbs.ll
@@ -802,6 +802,31 @@
   ret i32 %xor
 }
 
+define i32 @xor_i32_6147(i32 %a) nounwind {
+; RV32I-LABEL: xor_i32_6147:
+; RV32I:       # %bb.0:
+; RV32I-NEXT:    lui a1, 2
+; RV32I-NEXT:    addi a1, a1, -2045
+; RV32I-NEXT:    xor a0, a0, a1
+; RV32I-NEXT:    ret
+;
+; RV32IB-LABEL: xor_i32_6147:
+; RV32IB:       # %bb.0:
+; RV32IB-NEXT:    lui a1, 2
+; RV32IB-NEXT:    addi a1, a1, -2045
+; RV32IB-NEXT:    xor a0, a0, a1
+; RV32IB-NEXT:    ret
+;
+; RV32IBS-LABEL: xor_i32_6147:
+; RV32IBS:       # %bb.0:
+; RV32IBS-NEXT:    lui a1, 2
+; RV32IBS-NEXT:    addi a1, a1, -2045
+; RV32IBS-NEXT:    xor a0, a0, a1
+; RV32IBS-NEXT:    ret
+  %xor = xor i32 %a, 6147
+  ret i32 %xor
+}
+
 define i32 @or_i32_4098(i32 %a) nounwind {
 ; RV32I-LABEL: or_i32_4098:
 ; RV32I:       # %bb.0:
@@ -893,3 +918,28 @@
   %or = or i32 %a, 66901
   ret i32 %or
 }
+
+define i32 @or_i32_6147(i32 %a) nounwind {
+; RV32I-LABEL: or_i32_6147:
+; RV32I:       # %bb.0:
+; RV32I-NEXT:    lui a1, 2
+; RV32I-NEXT:    addi a1, a1, -2045
+; RV32I-NEXT:    or a0, a0, a1
+; RV32I-NEXT:    ret
+;
+; RV32IB-LABEL: or_i32_6147:
+; RV32IB:       # %bb.0:
+; RV32IB-NEXT:    lui a1, 2
+; RV32IB-NEXT:    addi a1, a1, -2045
+; RV32IB-NEXT:    or a0, a0, a1
+; RV32IB-NEXT:    ret
+;
+; RV32IBS-LABEL: or_i32_6147:
+; RV32IBS:       # %bb.0:
+; RV32IBS-NEXT:    lui a1, 2
+; RV32IBS-NEXT:    addi a1, a1, -2045
+; RV32IBS-NEXT:    or a0, a0, a1
+; RV32IBS-NEXT:    ret
+  %or = or i32 %a, 6147
+  ret i32 %or
+}
Index: llvm/test/CodeGen/RISCV/rv64zbs.ll
===================================================================
--- llvm/test/CodeGen/RISCV/rv64zbs.ll
+++ llvm/test/CodeGen/RISCV/rv64zbs.ll
@@ -1327,6 +1327,31 @@
   ret i64 %xor
 }
 
+define i64 @xor_i64_6147(i64 %a) nounwind {
+; RV64I-LABEL: xor_i64_6147:
+; RV64I:       # %bb.0:
+; RV64I-NEXT:    lui a1, 2
+; RV64I-NEXT:    addiw a1, a1, -2045
+; RV64I-NEXT:    xor a0, a0, a1
+; RV64I-NEXT:    ret
+;
+; RV64IB-LABEL: xor_i64_6147:
+; RV64IB:       # %bb.0:
+; RV64IB-NEXT:    lui a1, 2
+; RV64IB-NEXT:    addiw a1, a1, -2045
+; RV64IB-NEXT:    xor a0, a0, a1
+; RV64IB-NEXT:    ret
+;
+; RV64IBS-LABEL: xor_i64_6147:
+; RV64IBS:       # %bb.0:
+; RV64IBS-NEXT:    lui a1, 2
+; RV64IBS-NEXT:    addiw a1, a1, -2045
+; RV64IBS-NEXT:    xor a0, a0, a1
+; RV64IBS-NEXT:    ret
+  %xor = xor i64 %a, 6147
+  ret i64 %xor
+}
+
 define i64 @or_i64_4099(i64 %a) nounwind {
 ; RV64I-LABEL: or_i64_4099:
 ; RV64I:       # %bb.0:
@@ -1395,3 +1420,28 @@
   %or = or i64 %a, 66901
   ret i64 %or
 }
+
+define i64 @or_i64_6147(i64 %a) nounwind {
+; RV64I-LABEL: or_i64_6147:
+; RV64I:       # %bb.0:
+; RV64I-NEXT:    lui a1, 2
+; RV64I-NEXT:    addiw a1, a1, -2045
+; RV64I-NEXT:    or a0, a0, a1
+; RV64I-NEXT:    ret
+;
+; RV64IB-LABEL: or_i64_6147:
+; RV64IB:       # %bb.0:
+; RV64IB-NEXT:    lui a1, 2
+; RV64IB-NEXT:    addiw a1, a1, -2045
+; RV64IB-NEXT:    or a0, a0, a1
+; RV64IB-NEXT:    ret
+;
+; RV64IBS-LABEL: or_i64_6147:
+; RV64IBS:       # %bb.0:
+; RV64IBS-NEXT:    lui a1, 2
+; RV64IBS-NEXT:    addiw a1, a1, -2045
+; RV64IBS-NEXT:    or a0, a0, a1
+; RV64IBS-NEXT:    ret
+  %xor = or i64 %a, 6147
+  ret i64 %xor
+}