tile: fix build

[dpdk.git] / app / test / test_memcpy.c

diff --git a/app/test/test_memcpy.c b/app/test/test_memcpy.c
index 75cd09c..1d93dd5 100644 (file)
--- a/app/test/test_memcpy.c
+++ b/app/test/test_memcpy.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -37,11 +37,7 @@
 #include <stdlib.h>
 
 #include <rte_common.h>
-#include <cmdline_parse.h>
-#include <rte_cycles.h>
 #include <rte_random.h>
-#include <rte_malloc.h>
-
 #include <rte_memcpy.h>
 
 #include "test.h"
@@ -66,69 +62,10 @@ static size_t buf_sizes[TEST_VALUE_RANGE];
 #define SMALL_BUFFER_SIZE       TEST_VALUE_RANGE
 #endif /* TEST_VALUE_RANGE == 0 */
 
-
-/*
- * Arrays of this size are used for measuring uncached memory accesses by
- * picking a random location within the buffer. Make this smaller if there are
- * memory allocation errors.
- */
-#define LARGE_BUFFER_SIZE       (100 * 1024 * 1024)
-
-/* How many times to run timing loop for performance tests */
-#define TEST_ITERATIONS         1000000
-#define TEST_BATCH_SIZE         100
-
 /* Data is aligned on this many bytes (power of 2) */
-#define ALIGNMENT_UNIT          16
-
+#define ALIGNMENT_UNIT          32
 
 
-/* Structure with base memcpy func pointer, and number of bytes it copies */
-struct base_memcpy_func {
-       void (*func)(uint8_t *dst, const uint8_t *src);
-       unsigned size;
-};
-
-/* To create base_memcpy_func structure entries */
-#define BASE_FUNC(n) {rte_mov##n, n}
-
-/* Max number of bytes that can be copies with a "base" memcpy functions */
-#define MAX_BASE_FUNC_SIZE 256
-
-/*
- * Test the "base" memcpy functions, that a copy fixed number of bytes.
- */
-static int
-base_func_test(void)
-{
-       const struct base_memcpy_func base_memcpy_funcs[6] = {
-               BASE_FUNC(16),
-               BASE_FUNC(32),
-               BASE_FUNC(48),
-               BASE_FUNC(64),
-               BASE_FUNC(128),
-               BASE_FUNC(256),
-       };
-       unsigned i, j;
-       unsigned num_funcs = sizeof(base_memcpy_funcs) / sizeof(base_memcpy_funcs[0]);
-       uint8_t dst[MAX_BASE_FUNC_SIZE];
-       uint8_t src[MAX_BASE_FUNC_SIZE];
-
-       for (i = 0; i < num_funcs; i++) {
-               unsigned size = base_memcpy_funcs[i].size;
-               for (j = 0; j < size; j++) {
-                       dst[j] = 0;
-                       src[j] = (uint8_t) rte_rand();
-               }
-               base_memcpy_funcs[i].func(dst, src);
-               for (j = 0; j < size; j++)
-                       if (dst[j] != src[j])
-                               return -1;
-       }
-
-       return 0;
-}
-
 /*
  * Create two buffers, and initialise one with random values. These are copied
  * to the second buffer and then compared to see if the copy was successful.
@@ -211,16 +148,15 @@ func_test(void)
        return 0;
 }
 
-int
+static int
 test_memcpy(void)
 {
        int ret;
 
        ret = func_test();
-       if (ret != 0)
-               return -1;
-       ret = base_func_test();
        if (ret != 0)
                return -1;
        return 0;
 }
+
+REGISTER_TEST_COMMAND(memcpy_autotest, test_memcpy);