Commit c827ac45 authored by Simon Guo's avatar Simon Guo Committed by Michael Ellerman

selftests/powerpc: Update memcmp_64 selftest for VMX implementation

This patch reworked selftest memcmp_64 so that memcmp selftest can
cover more test cases.

It adds testcases for:
- memcmp over 4K bytes size.
- s1/s2 with different/random offset on 16 bytes boundary.
- enter/exit_vmx_ops pairness.
Signed-off-by: default avatarSimon Guo <wei.guo.simon@gmail.com>
[mpe: Add -maltivec to fix build on some toolchains]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c2a4e54e
...@@ -36,11 +36,11 @@ FUNC_START(exit_vmx_usercopy) ...@@ -36,11 +36,11 @@ FUNC_START(exit_vmx_usercopy)
li r3,0 li r3,0
blr blr
FUNC_START(enter_vmx_copy) FUNC_START(enter_vmx_ops)
li r3,1 li r3,1
blr blr
FUNC_START(exit_vmx_copy) FUNC_START(exit_vmx_ops)
blr blr
FUNC_START(memcpy_power7) FUNC_START(memcpy_power7)
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# The loops are all 64-bit code # The loops are all 64-bit code
CFLAGS += -m64 CFLAGS += -m64 -maltivec
CFLAGS += -I$(CURDIR) CFLAGS += -I$(CURDIR)
TEST_GEN_PROGS := memcmp TEST_GEN_PROGS := memcmp
......
/*
* Copyright 2009 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
* provides masks and opcode images for use by code generation, emulation
* and for instructions that older assemblers might not know about
*/
#ifndef _ASM_POWERPC_PPC_OPCODE_H
#define _ASM_POWERPC_PPC_OPCODE_H
# define stringify_in_c(...) __VA_ARGS__
# define ASM_CONST(x) x
#define PPC_INST_VCMPEQUD_RC 0x100000c7
#define PPC_INST_VCMPEQUB_RC 0x10000006
#define __PPC_RC21 (0x1 << 10)
/* macros to insert fields into opcodes */
#define ___PPC_RA(a) (((a) & 0x1f) << 16)
#define ___PPC_RB(b) (((b) & 0x1f) << 11)
#define ___PPC_RS(s) (((s) & 0x1f) << 21)
#define ___PPC_RT(t) ___PPC_RS(t)
#define VCMPEQUD_RC(vrt, vra, vrb) stringify_in_c(.long PPC_INST_VCMPEQUD_RC | \
___PPC_RT(vrt) | ___PPC_RA(vra) | \
___PPC_RB(vrb) | __PPC_RC21)
#define VCMPEQUB_RC(vrt, vra, vrb) stringify_in_c(.long PPC_INST_VCMPEQUB_RC | \
___PPC_RT(vrt) | ___PPC_RA(vra) | \
___PPC_RB(vrb) | __PPC_RC21)
#endif /* _ASM_POWERPC_PPC_OPCODE_H */
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _PPC_ASM_H
#define __PPC_ASM_H
#include <ppc-asm.h> #include <ppc-asm.h>
#ifndef r1 #ifndef r1
...@@ -6,3 +8,26 @@ ...@@ -6,3 +8,26 @@
#endif #endif
#define _GLOBAL(A) FUNC_START(test_ ## A) #define _GLOBAL(A) FUNC_START(test_ ## A)
#define _GLOBAL_TOC(A) FUNC_START(test_ ## A)
#define CONFIG_ALTIVEC
#define R14 r14
#define R15 r15
#define R16 r16
#define R17 r17
#define R18 r18
#define R19 r19
#define R20 r20
#define R21 r21
#define R22 r22
#define R29 r29
#define R30 r30
#define R31 r31
#define STACKFRAMESIZE 256
#define STK_REG(i) (112 + ((i)-14)*8)
#define BEGIN_FTR_SECTION
#define END_FTR_SECTION_IFSET(val)
#endif
...@@ -2,20 +2,40 @@ ...@@ -2,20 +2,40 @@
#include <malloc.h> #include <malloc.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h>
#include "utils.h" #include "utils.h"
#define SIZE 256 #define SIZE 256
#define ITERATIONS 10000 #define ITERATIONS 10000
#define LARGE_SIZE (5 * 1024)
#define LARGE_ITERATIONS 1000
#define LARGE_MAX_OFFSET 32
#define LARGE_SIZE_START 4096
#define MAX_OFFSET_DIFF_S1_S2 48
int vmx_count;
int enter_vmx_ops(void)
{
vmx_count++;
return 1;
}
void exit_vmx_ops(void)
{
vmx_count--;
}
int test_memcmp(const void *s1, const void *s2, size_t n); int test_memcmp(const void *s1, const void *s2, size_t n);
/* test all offsets and lengths */ /* test all offsets and lengths */
static void test_one(char *s1, char *s2) static void test_one(char *s1, char *s2, unsigned long max_offset,
unsigned long size_start, unsigned long max_size)
{ {
unsigned long offset, size; unsigned long offset, size;
for (offset = 0; offset < SIZE; offset++) { for (offset = 0; offset < max_offset; offset++) {
for (size = 0; size < (SIZE-offset); size++) { for (size = size_start; size < (max_size - offset); size++) {
int x, y; int x, y;
unsigned long i; unsigned long i;
...@@ -35,70 +55,104 @@ static void test_one(char *s1, char *s2) ...@@ -35,70 +55,104 @@ static void test_one(char *s1, char *s2)
printf("\n"); printf("\n");
abort(); abort();
} }
if (vmx_count != 0) {
printf("vmx enter/exit not paired.(offset:%ld size:%ld s1:%p s2:%p vc:%d\n",
offset, size, s1, s2, vmx_count);
printf("\n");
abort();
}
} }
} }
} }
static int testcase(void) static int testcase(bool islarge)
{ {
char *s1; char *s1;
char *s2; char *s2;
unsigned long i; unsigned long i;
s1 = memalign(128, SIZE); unsigned long comp_size = (islarge ? LARGE_SIZE : SIZE);
unsigned long alloc_size = comp_size + MAX_OFFSET_DIFF_S1_S2;
int iterations = islarge ? LARGE_ITERATIONS : ITERATIONS;
s1 = memalign(128, alloc_size);
if (!s1) { if (!s1) {
perror("memalign"); perror("memalign");
exit(1); exit(1);
} }
s2 = memalign(128, SIZE); s2 = memalign(128, alloc_size);
if (!s2) { if (!s2) {
perror("memalign"); perror("memalign");
exit(1); exit(1);
} }
srandom(1); srandom(time(0));
for (i = 0; i < ITERATIONS; i++) { for (i = 0; i < iterations; i++) {
unsigned long j; unsigned long j;
unsigned long change; unsigned long change;
char *rand_s1 = s1;
char *rand_s2 = s2;
for (j = 0; j < SIZE; j++) for (j = 0; j < alloc_size; j++)
s1[j] = random(); s1[j] = random();
memcpy(s2, s1, SIZE); rand_s1 += random() % MAX_OFFSET_DIFF_S1_S2;
rand_s2 += random() % MAX_OFFSET_DIFF_S1_S2;
memcpy(rand_s2, rand_s1, comp_size);
/* change one byte */ /* change one byte */
change = random() % SIZE; change = random() % comp_size;
s2[change] = random() & 0xff; rand_s2[change] = random() & 0xff;
test_one(s1, s2); if (islarge)
test_one(rand_s1, rand_s2, LARGE_MAX_OFFSET,
LARGE_SIZE_START, comp_size);
else
test_one(rand_s1, rand_s2, SIZE, 0, comp_size);
} }
srandom(1); srandom(time(0));
for (i = 0; i < ITERATIONS; i++) { for (i = 0; i < iterations; i++) {
unsigned long j; unsigned long j;
unsigned long change; unsigned long change;
char *rand_s1 = s1;
char *rand_s2 = s2;
for (j = 0; j < SIZE; j++) for (j = 0; j < alloc_size; j++)
s1[j] = random(); s1[j] = random();
memcpy(s2, s1, SIZE); rand_s1 += random() % MAX_OFFSET_DIFF_S1_S2;
rand_s2 += random() % MAX_OFFSET_DIFF_S1_S2;
memcpy(rand_s2, rand_s1, comp_size);
/* change multiple bytes, 1/8 of total */ /* change multiple bytes, 1/8 of total */
for (j = 0; j < SIZE / 8; j++) { for (j = 0; j < comp_size / 8; j++) {
change = random() % SIZE; change = random() % comp_size;
s2[change] = random() & 0xff; s2[change] = random() & 0xff;
} }
test_one(s1, s2); if (islarge)
test_one(rand_s1, rand_s2, LARGE_MAX_OFFSET,
LARGE_SIZE_START, comp_size);
else
test_one(rand_s1, rand_s2, SIZE, 0, comp_size);
} }
return 0; return 0;
} }
static int testcases(void)
{
testcase(0);
testcase(1);
return 0;
}
int main(void) int main(void)
{ {
return test_harness(testcase, "memcmp"); return test_harness(testcases, "memcmp");
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment