Fix scratch registers passed to mtvsrdd

miladfarca · V8 LUCI CQ · commit 2abc61361dd4 · 2025-09-10T10:05:31.000-07:00
`ra` cannot be r0 as it will be interpreted as Operand(0) Change-Id: Idce58191f9d3578dc91dc4aa3872a0bf2939d8b3 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6936113 Commit-Queue: Milad Farazmand <mfarazma@ibm.com> Reviewed-by: Junliang Yan <junyan1@ibm.com> Cr-Commit-Position: refs/heads/main@{#102388}
diff --git a/src/codegen/ppc/macro-assembler-ppc.cc b/src/codegen/ppc/macro-assembler-ppc.cc
@@ -4000,6 +4000,7 @@ void MacroAssembler::I64x2Mul(Simd128Register dst, Simd128Register src1,
   if (CpuFeatures::IsSupported(PPC_10_PLUS)) {
     vmulld(dst, src1, src2);
   } else {
+    DCHECK(scratch1 != r0);
     Register scratch_1 = scratch1;
     Register scratch_2 = scratch2;
     for (int i = 0; i < 2; i++) {
@@ -4352,6 +4353,7 @@ void MacroAssembler::I8x16BitMask(Register dst, Simd128Register src,
   if (CpuFeatures::IsSupported(PPC_10_PLUS)) {
     vextractbm(dst, src);
   } else {
+    DCHECK(scratch1 != r0);
     mov(scratch1, Operand(0x8101820283038));
     mov(scratch2, Operand(0x4048505860687078));
     mtvsrdd(scratch3, scratch1, scratch2);
@@ -4404,6 +4406,7 @@ void MacroAssembler::I8x16Shuffle(Simd128Register dst, Simd128Register src1,
                                   Simd128Register src2, uint64_t high,
                                   uint64_t low, Register scratch1,
                                   Register scratch2, Simd128Register scratch3) {
+  DCHECK(scratch2 != r0);
   mov(scratch1, Operand(low));
   mov(scratch2, Operand(high));
   mtvsrdd(scratch3, scratch2, scratch1);
@@ -4692,6 +4695,7 @@ void MacroAssembler::S128Not(Simd128Register dst, Simd128Register src) {
 
 void MacroAssembler::S128Const(Simd128Register dst, uint64_t high, uint64_t low,
                                Register scratch1, Register scratch2) {
+  DCHECK(scratch2 != r0);
   mov(scratch1, Operand(low));
   mov(scratch2, Operand(high));
   mtvsrdd(dst, scratch2, scratch1);
diff --git a/src/compiler/backend/ppc/code-generator-ppc.cc b/src/compiler/backend/ppc/code-generator-ppc.cc
@@ -2789,7 +2789,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I8x16BitMask: {
-      __ I8x16BitMask(i.OutputRegister(), i.InputSimd128Register(0), r0, ip,
+      __ I8x16BitMask(i.OutputRegister(), i.InputSimd128Register(0), ip, r0,
                       kScratchSimd128Reg);
       break;
     }
diff --git a/src/wasm/baseline/ppc/liftoff-assembler-ppc-inl.h b/src/wasm/baseline/ppc/liftoff-assembler-ppc-inl.h
@@ -2869,7 +2869,7 @@ void LiftoffAssembler::emit_v128_anytrue(LiftoffRegister dst,
 
 void LiftoffAssembler::emit_i8x16_bitmask(LiftoffRegister dst,
                                           LiftoffRegister src) {
-  I8x16BitMask(dst.gp(), src.fp().toSimd(), r0, ip, kScratchSimd128Reg);
+  I8x16BitMask(dst.gp(), src.fp().toSimd(), ip, r0, kScratchSimd128Reg);
 }
 
 void LiftoffAssembler::emit_s128_const(LiftoffRegister dst,

Original file line number	Diff line number	Diff line change
`@@ -2789,7 +2789,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(`
`2789`	`2789`	`break;`
`2790`	`2790`	`}`
`2791`	`2791`	`case kPPC_I8x16BitMask: {`
`2792`		`- __ I8x16BitMask(i.OutputRegister(), i.InputSimd128Register(0), r0, ip,`
	`2792`	`+ __ I8x16BitMask(i.OutputRegister(), i.InputSimd128Register(0), ip, r0,`
`2793`	`2793`	`kScratchSimd128Reg);`
`2794`	`2794`	`break;`
`2795`	`2795`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2869,7 +2869,7 @@ void LiftoffAssembler::emit_v128_anytrue(LiftoffRegister dst,`
`2869`	`2869`
`2870`	`2870`	`void LiftoffAssembler::emit_i8x16_bitmask(LiftoffRegister dst,`
`2871`	`2871`	`LiftoffRegister src) {`
`2872`		`- I8x16BitMask(dst.gp(), src.fp().toSimd(), r0, ip, kScratchSimd128Reg);`
	`2872`	`+ I8x16BitMask(dst.gp(), src.fp().toSimd(), ip, r0, kScratchSimd128Reg);`
`2873`	`2873`	`}`
`2874`	`2874`
`2875`	`2875`	`void LiftoffAssembler::emit_s128_const(LiftoffRegister dst,`