Skip to contentSkip to conversation

VSX 32-byte vector paired load/store instructions

PATCH Superseded Balamuruhan S 2 participants 7 messages Jul 16, 2020 PowerPC

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover VSX 32-byte vector paired load/store instructions

VSX vector paired instructions operates with octword (32-byte) operand for loads and stores between storage and a pair of two sequential Vector-Scalar Registers (VSRs). There are 4 word instructions and 2 prefixed instructions that provides this 32-byte storage access operations - lxvp, lxvpx, stxvp, stxvpx, plxvpx, pstxvpx.

Emulation infrastructure doesn't have support for these instructions, to operate with 32-byte storage access and to operate with 2 VSX registers. This patch series enables the instruction emulation support and adds test cases for them respectively.

Changes in v2:
-------------
* Fix suggestion from Sandipan, wrap ISA 3.1 instructions with cpu_has_feature(CPU_FTR_ARCH_31) check.

* Rebase on latest powerpc next branch.

Balamuruhan S (4):
powerpc/sstep: support new VSX vector paired storage access
instructions
powerpc/sstep: support emulation for vsx vector paired storage access
instructions
powerpc ppc-opcode: add opcodes for vsx vector paired instructions powerpc sstep: add testcases for vsx load/store instructions

 arch/powerpc/include/asm/ppc-opcode.h |  11 ++
 arch/powerpc/include/asm/sstep.h      |   2 +-
 arch/powerpc/lib/sstep.c              | 110 ++++++++++-
 arch/powerpc/lib/test_emulate_step.c  | 273 ++++++++++++++++++++++++++
 4 files changed, 386 insertions(+), 10 deletions(-)

base-commit: b2b46304e9360f3dda49c9d8ba4a1478b9eecf1d

Signature · 1 line
2.24.1
#1 lore raw

PATCH v2 1/4 powerpc/sstep: support new VSX vector paired storage access instructions

VSX Vector Paired instructions loads/stores an octword (32 bytes) from/to storage into two sequential VSRs. Add analyse_instr() support to these new instructions,
* Load VSX Vector Paired (lxvp)
* Load VSX Vector Paired Indexed (lxvpx)
* Prefixed Load VSX Vector Paired (plxvp)
* Store VSX Vector Paired (stxvp)
* Store VSX Vector Paired Indexed (stxvpx)
* Prefixed Store VSX Vector Paired (pstxvp)

---
 arch/powerpc/lib/sstep.c | 52 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
arch/powerpc/lib/sstep.c +52 -0
index 5abe98216dc2..1af8c1920b36 100644
@@ -31,6 +31,10 @@ extern char system_call_common[];
 #define XER_OV32	0x00080000U
 #define XER_CA32	0x00040000U
 
+#ifdef CONFIG_VSX
+#define VSX_REGISTER_XTP(rd)   ((((rd) & 1) << 5) | ((rd) & 0xfe))
+#endif
+
 #ifdef CONFIG_PPC_FPU
 /*
  * Functions in ldstfp.S
@@ -2382,6 +2386,15 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
 			op->vsx_flags = VSX_SPLAT;
 			break;
 
+		case 333:       /* lxvpx */
+			if (!cpu_has_feature(CPU_FTR_ARCH_31))
+				return -1;
+			op->reg = VSX_REGISTER_XTP(rd);
+			op->type = MKOP(LOAD_VSX, 0, 32);
+			op->element_size = 32;
+			op->vsx_flags = VSX_CHECK_VEC;
+			break;
+
 		case 364:	/* lxvwsx */
 			op->reg = rd | ((word & 1) << 5);
 			op->type = MKOP(LOAD_VSX, 0, 4);
@@ -2410,6 +2423,14 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
 				VSX_CHECK_VEC;
 			break;
 		}
+		case 461:       /* stxvpx */
+			if (!cpu_has_feature(CPU_FTR_ARCH_31))
+				return -1;
+			op->reg = VSX_REGISTER_XTP(rd);
+			op->type = MKOP(STORE_VSX, 0, 32);
+			op->element_size = 32;
+			op->vsx_flags = VSX_CHECK_VEC;
+			break;
 		case 524:	/* lxsspx */
 			op->reg = rd | ((word & 1) << 5);
 			op->type = MKOP(LOAD_VSX, 0, 4);
@@ -2651,6 +2672,23 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
 #endif
 
 #ifdef CONFIG_VSX
+	case 6:
+		if (!cpu_has_feature(CPU_FTR_ARCH_31))
+			return -1;
+		op->ea = dqform_ea(word, regs);
+		op->reg = VSX_REGISTER_XTP(rd);
+		op->element_size = 32;
+		op->vsx_flags = VSX_CHECK_VEC;
+		switch (word & 0xf) {
+		case 0:         /* lxvp */
+			op->type = MKOP(LOAD_VSX, 0, 32);
+			break;
+		case 1:         /* stxvp */
+			op->type = MKOP(STORE_VSX, 0, 32);
+			break;
+		}
+		break;
+
 	case 61:	/* stfdp, lxv, stxsd, stxssp, stxv */
 		switch (word & 7) {
 		case 0:		/* stfdp with LSB of DS field = 0 */
@@ -2715,6 +2753,8 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
 		}
 		break;
 	case 1: /* Prefixed instructions */
+		if (!cpu_has_feature(CPU_FTR_ARCH_31))
+			return -1;
 		prefix_r = word & (1ul << 20);
 		ra = (suffix >> 16) & 0x1f;
 		op->update_reg = ra;
@@ -2779,12 +2819,24 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
 			case 57:	/* pld */
 				op->type = MKOP(LOAD, PREFIXED, 8);
 				break;
+			case 58:        /* plxvp */
+				op->reg = VSX_REGISTER_XTP(rd);
+				op->type = MKOP(LOAD_VSX, PREFIXED, 32);
+				op->element_size = 32;
+				op->vsx_flags = VSX_CHECK_VEC;
+				break;
 			case 60:        /* stq */
 				op->type = MKOP(STORE, PREFIXED, 16);
 				break;
 			case 61:	/* pstd */
 				op->type = MKOP(STORE, PREFIXED, 8);
 				break;
+			case 62:        /* pstxvp */
+				op->reg = VSX_REGISTER_XTP(rd);
+				op->type = MKOP(STORE_VSX, PREFIXED, 32);
+				op->element_size = 32;
+				op->vsx_flags = VSX_CHECK_VEC;
+				break;
 			}
 			break;
 		case 1: /* Type 01 Eight-Byte Register-to-Register */
Signature · 1 line
2.24.1
#2 lore raw

Re: [PATCH v2 1/4] powerpc/sstep: support new VSX vector paired storage access instructions

Hi Bala,

arch/powerpc/lib/sstep.c int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, · line 2395

Quoted 11 lines
arch/powerpc/lib/sstep.c +7 -0
@@ -2382,6 +2386,15 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
  			op->vsx_flags = VSX_SPLAT;
  			break;
 
+		case 333:       /* lxvpx */
+			if (!cpu_has_feature(CPU_FTR_ARCH_31))
+				return -1;
+			op->reg = VSX_REGISTER_XTP(rd);
+			op->type = MKOP(LOAD_VSX, 0, 32);
+			op->element_size = 32;
+			op->vsx_flags = VSX_CHECK_VEC;

Why VSX_CHECK_VEC?

Ravi

#3 lore raw

PATCH v2 2/4 powerpc/sstep: support emulation for vsx vector paired storage access instructions

In reply to Balamuruhan S

add emulate_step() changes to support vsx vector paired storage access instructions that provides octword operands loads/stores between storage and set of 2 Vector Scalar Registers (VSRs).

---
 arch/powerpc/include/asm/sstep.h |  2 +-
 arch/powerpc/lib/sstep.c         | 58 +++++++++++++++++++++++++++-----
 2 files changed, 50 insertions(+), 10 deletions(-)
arch/powerpc/include/asm/sstep.h +1 -1
index 3b01c69a44aa..a6c0b299bcc9 100644
@@ -126,7 +126,7 @@ union vsx_reg {
 	unsigned long d[2];
 	float	fp[4];
 	double	dp[2];
-	__vector128 v;
+	__vector128 v[2];
 };
 
 /*
arch/powerpc/lib/sstep.c +49 -9

129 lines not on this page · raw message

Signature · 1 line
2.24.1
#4 lore raw

Re: [PATCH v2 2/4] powerpc/sstep: support emulation for vsx vector paired storage access instructions

Hi Bala,

arch/powerpc/lib/sstep.c void emulate_vsx_load(struct instruction_op *op, union vsx_reg *reg, · line 726

Quoted 6 lines
arch/powerpc/lib/sstep.c +2 -0
@@ -709,6 +722,8 @@ void emulate_vsx_load(struct instruction_op *op, union vsx_reg *reg,
  	reg->d[0] = reg->d[1] = 0;
 
  	switch (op->element_size) {
+	case 32:
+		/* [p]lxvp[x] or [p]stxvp[x] */

This function does not emulate stvxp ^^^^

Quoted 13 lines
arch/powerpc/lib/sstep.c +1 -1
  	case 16:
  		/* whole vector; lxv[x] or lxvl[l] */
  		if (size == 0)
@@ -717,7 +732,7 @@ void emulate_vsx_load(struct instruction_op *op, union vsx_reg *reg,
  		if (IS_LE && (op->vsx_flags & VSX_LDLEFT))
  			rev = !rev;
  		if (rev)
-			do_byte_reverse(reg, 16);
+			do_byte_reverse(reg, size);
  		break;
  	case 8:
  		/* scalar loads, lxvd2x, lxvdsx */

arch/powerpc/lib/sstep.c void emulate_vsx_store(struct instruction_op *op, const union vsx_reg *reg, · line 812

Quoted 5 lines
arch/powerpc/lib/sstep.c +2 -0
@@ -793,6 +808,22 @@ void emulate_vsx_store(struct instruction_op *op, const union vsx_reg *reg,
  	size = GETSIZE(op->type);
 
  	switch (op->element_size) {
+	case 32:
+		/* [p]lxvp[x] or [p]stxvp[x] */

This function does not emulate lxvp ^^^^

arch/powerpc/lib/sstep.c void emulate_vsx_store(struct instruction_op *op, const union vsx_reg *reg, · line 816

Quoted 4 lines
arch/powerpc/lib/sstep.c +4 -0
+		if (size == 0)
+			break;
+		if (IS_LE && (op->vsx_flags & VSX_LDLEFT))
+			rev = !rev;

Why this if condition ^^^^ ?

Quoted 28 lines
arch/powerpc/lib/sstep.c +13 -1
+		if (rev) {
+			/* reverse 32 bytes */
+			buf.d[0] = byterev_8(reg->d[3]);
+			buf.d[1] = byterev_8(reg->d[2]);
+			buf.d[2] = byterev_8(reg->d[1]);
+			buf.d[3] = byterev_8(reg->d[0]);
+			reg = &buf;
+		}
+		memcpy(mem, reg, size);
+		break;
  	case 16:
  		/* stxv, stxvx, stxvl, stxvll */
  		if (size == 0)
@@ -861,28 +892,33 @@ static nokprobe_inline int do_vsx_load(struct instruction_op *op,
  				       bool cross_endian)
  {
  	int reg = op->reg;
-	u8 mem[16];
+	int i, nr_vsx_regs;
+	u8 mem[32];
  	union vsx_reg buf;
  	int size = GETSIZE(op->type);
 
  	if (!address_ok(regs, ea, size) || copy_mem_in(mem, ea, size, regs))
  		return -EFAULT;
 
+	nr_vsx_regs = size / sizeof(__vector128);
  	emulate_vsx_load(op, &buf, mem, cross_endian);

arch/powerpc/lib/sstep.c static nokprobe_inline int do_vsx_load(struct instruction_op *op, · line 913

Quoted 10 lines
arch/powerpc/lib/sstep.c +2 -1
  	preempt_disable();
  	if (reg < 32) {
  		/* FP regs + extensions */
  		if (regs->msr & MSR_FP) {
-			load_vsrn(reg, &buf);
+			for (i = 0; i < nr_vsx_regs; i++)
+				load_vsrn(reg + i, &buf.v[i]);
  		} else {
  			current->thread.fp_state.fpr[reg][0] = buf.d[0];
  			current->thread.fp_state.fpr[reg][1] = buf.d[1];

Should we change else part as well?

arch/powerpc/lib/sstep.c static nokprobe_inline int do_vsx_load(struct instruction_op *op, · line 919

Quoted 7 lines
arch/powerpc/lib/sstep.c +3 -1
  		}
  	} else {
  		if (regs->msr & MSR_VEC)
-			load_vsrn(reg, &buf);
+			for (i = 0; i < nr_vsx_regs; i++)
+				load_vsrn(reg + i, &buf.v[i]);
+

Unnecessary line.

arch/powerpc/lib/sstep.c static nokprobe_inline int do_vsx_load(struct instruction_op *op, · line 921

Quoted 3 lines
arch/powerpc/lib/sstep.c +1 -1
  		else
-			current->thread.vr_state.vr[reg - 32] = buf.v;
+			current->thread.vr_state.vr[reg - 32] = buf.v[0];

Same here. else part, should we add:

if (vsx 32 byte)
current->thread.vr_state.vr[reg - 32 + 1] = buf.v[1];

Quoted 30 lines
arch/powerpc/lib/sstep.c +5 -2
  	}
  	preempt_enable();
  	return 0;
@@ -893,27 +929,31 @@ static nokprobe_inline int do_vsx_store(struct instruction_op *op,
  					bool cross_endian)
  {
  	int reg = op->reg;
-	u8 mem[16];
+	int i, nr_vsx_regs;
+	u8 mem[32];
  	union vsx_reg buf;
  	int size = GETSIZE(op->type);
 
  	if (!address_ok(regs, ea, size))
  		return -EFAULT;
 
+	nr_vsx_regs = size / sizeof(__vector128);
  	preempt_disable();
  	if (reg < 32) {
  		/* FP regs + extensions */
  		if (regs->msr & MSR_FP) {
-			store_vsrn(reg, &buf);
+			for (i = 0; i < nr_vsx_regs; i++)
+				store_vsrn(reg + i, &buf.v[i]);
  		} else {
  			buf.d[0] = current->thread.fp_state.fpr[reg][0];
  			buf.d[1] = current->thread.fp_state.fpr[reg][1];
  		}
  	} else {

arch/powerpc/lib/sstep.c static nokprobe_inline int do_vsx_store(struct instruction_op *op, · line 959

Quoted 10 lines
arch/powerpc/lib/sstep.c +3 -2
  		if (regs->msr & MSR_VEC)
-			store_vsrn(reg, &buf);
+			for (i = 0; i < nr_vsx_regs; i++)
+				store_vsrn(reg + i, &buf.v[i]);
  		else
-			buf.v = current->thread.vr_state.vr[reg - 32];
+			buf.v[0] = current->thread.vr_state.vr[reg - 32];
  	}
  	preempt_enable();
  	emulate_vsx_store(op, &buf, mem, cross_endian);

Ravi

#5 lore raw

PATCH v2 3/4 powerpc ppc-opcode: add opcodes for vsx vector paired instructions

In reply to Balamuruhan S

add instruction opcodes for new vsx vector paired instructions,
* Load VSX Vector Paired (lxvp)
* Load VSX Vector Paired Indexed (lxvpx)
* Store VSX Vector Paired (stxvp)
* Store VSX Vector Paired Indexed (stxvpx)

---
 arch/powerpc/include/asm/ppc-opcode.h | 4 ++++
 1 file changed, 4 insertions(+)
arch/powerpc/include/asm/ppc-opcode.h +4 -0
index 777d5056a71c..f7ffbe11624e 100644
@@ -210,6 +210,10 @@
 #define PPC_INST_ISEL			0x7c00001e
 #define PPC_INST_ISEL_MASK		0xfc00003e
 #define PPC_INST_LDARX			0x7c0000a8
+#define PPC_INST_LXVP			0x18000000
+#define PPC_INST_LXVPX			0x7c00029a
+#define PPC_INST_STXVP			0x18000001
+#define PPC_INST_STXVPX			0x7c00039a
 #define PPC_INST_STDCX			0x7c0001ad
 #define PPC_INST_LQARX			0x7c000228
 #define PPC_INST_STQCX			0x7c00016d
Signature · 1 line
2.24.1
#6 lore raw

PATCH v2 4/4 powerpc sstep: add testcases for vsx load/store instructions

In reply to Balamuruhan S

add testcases for vsx load/store vector paired instructions,
* Load VSX Vector Paired (lxvp)
* Load VSX Vector Paired Indexed (lxvpx)
* Prefixed Load VSX Vector Paired (plxvp)
* Store VSX Vector Paired (stxvp)
* Store VSX Vector Paired Indexed (stxvpx)
* Prefixed Store VSX Vector Paired (pstxvp)

---
 arch/powerpc/include/asm/ppc-opcode.h |   7 +
 arch/powerpc/lib/test_emulate_step.c  | 273 ++++++++++++++++++++++++++
 2 files changed, 280 insertions(+)
arch/powerpc/include/asm/ppc-opcode.h +7 -0
index f7ffbe11624e..aa688d13981a 100644
@@ -389,6 +389,10 @@
 #define PPC_INST_VCMPEQUD		0x100000c7
 #define PPC_INST_VCMPEQUB		0x10000006
 
+/* Prefixes */
+#define PPC_PREFIX_MLS			0x06000000
+#define PPC_PREFIX_8LS			0x04000000
+
 /* macros to insert fields into opcodes */
 #define ___PPC_RA(a)	(((a) & 0x1f) << 16)
 #define ___PPC_RB(b)	(((b) & 0x1f) << 11)
@@ -420,6 +424,9 @@
 #define __PPC_CT(t)	(((t) & 0x0f) << 21)
 #define __PPC_SPR(r)	((((r) & 0x1f) << 16) | ((((r) >> 5) & 0x1f) << 11))
 #define __PPC_RC21	(0x1 << 10)
+#define __PPC_PRFX_R(r)	(((r) & 0x1) << 20)
+#define __PPC_TP(tp)	(((tp) & 0xf) << 22)
+#define __PPC_TX(tx)	(((tx) & 0x1) << 21)
 
 /*
  * Both low and high 16 bits are added as SIGNED additions, so if low 16 bits
arch/powerpc/lib/test_emulate_step.c +273 -0

298 lines not on this page · raw message

Signature · 1 line
2.24.1