From 09abf1b529b4226f585ecfbb20866715b901755b Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 1 Dec 2021 13:34:22 +0800 Subject: +fpm --- .../ThirdParty/libfixmath/fixtest/fixtest.depend | 134 +++++++------- Client/ThirdParty/libfixmath/fixtest/hiclock.c | 56 +++--- Client/ThirdParty/libfixmath/fixtest/hiclock.h | 66 +++---- Client/ThirdParty/libfixmath/fixtest/main.c | 192 ++++++++++----------- 4 files changed, 224 insertions(+), 224 deletions(-) (limited to 'Client/ThirdParty/libfixmath/fixtest') diff --git a/Client/ThirdParty/libfixmath/fixtest/fixtest.depend b/Client/ThirdParty/libfixmath/fixtest/fixtest.depend index 7227a2f..26758c6 100644 --- a/Client/ThirdParty/libfixmath/fixtest/fixtest.depend +++ b/Client/ThirdParty/libfixmath/fixtest/fixtest.depend @@ -1,67 +1,67 @@ -# depslib dependency file v1.0 -1298636296 source:g:\vrfx\libfixmath\fixtest\main.c - - - - - - - "hiclock.h" - -1298453688 g:\vrfx\libfixmath\\libfixmath\fixmath.h - "uint32.h" - "fract32.h" - "fix16.h" - -1298453688 g:\vrfx\libfixmath\\libfixmath\uint32.h - - -1298453688 g:\vrfx\libfixmath\\libfixmath\fract32.h - - -1298648502 g:\vrfx\libfixmath\\libfixmath\fix16.h - - -1298562746 source:g:\vrfx\libfixmath\fixtest\hiclock.c - "hiclock.h" - -1298564182 g:\vrfx\libfixmath\fixtest\hiclock.h - - - - - - -1298567472 source:i:\vrfx\libfixmath\fixtest\main.c - - - - - - - "hiclock.h" - -1298453688 i:\vrfx\libfixmath\\libfixmath\fixmath.h - "uint32.h" - "fract32.h" - "fix16.h" - -1298453688 i:\vrfx\libfixmath\\libfixmath\uint32.h - - -1298453688 i:\vrfx\libfixmath\\libfixmath\fract32.h - - -1298577432 i:\vrfx\libfixmath\\libfixmath\fix16.h - - -1298564182 i:\vrfx\libfixmath\fixtest\hiclock.h - - - - - - -1298562746 source:i:\vrfx\libfixmath\fixtest\hiclock.c - "hiclock.h" - +# depslib dependency file v1.0 +1298636296 source:g:\vrfx\libfixmath\fixtest\main.c + + + + + + + "hiclock.h" + +1298453688 g:\vrfx\libfixmath\\libfixmath\fixmath.h + "uint32.h" + "fract32.h" + "fix16.h" + +1298453688 g:\vrfx\libfixmath\\libfixmath\uint32.h + + +1298453688 g:\vrfx\libfixmath\\libfixmath\fract32.h + + +1298648502 g:\vrfx\libfixmath\\libfixmath\fix16.h + + +1298562746 source:g:\vrfx\libfixmath\fixtest\hiclock.c + "hiclock.h" + +1298564182 g:\vrfx\libfixmath\fixtest\hiclock.h + + + + + + +1298567472 source:i:\vrfx\libfixmath\fixtest\main.c + + + + + + + "hiclock.h" + +1298453688 i:\vrfx\libfixmath\\libfixmath\fixmath.h + "uint32.h" + "fract32.h" + "fix16.h" + +1298453688 i:\vrfx\libfixmath\\libfixmath\uint32.h + + +1298453688 i:\vrfx\libfixmath\\libfixmath\fract32.h + + +1298577432 i:\vrfx\libfixmath\\libfixmath\fix16.h + + +1298564182 i:\vrfx\libfixmath\fixtest\hiclock.h + + + + + + +1298562746 source:i:\vrfx\libfixmath\fixtest\hiclock.c + "hiclock.h" + diff --git a/Client/ThirdParty/libfixmath/fixtest/hiclock.c b/Client/ThirdParty/libfixmath/fixtest/hiclock.c index 81f5b94..5ce58df 100644 --- a/Client/ThirdParty/libfixmath/fixtest/hiclock.c +++ b/Client/ThirdParty/libfixmath/fixtest/hiclock.c @@ -1,28 +1,28 @@ -#include "hiclock.h" -#include - -#if defined(__WIN32) || defined(__WIN64) -LONGLONG HICLOCKS_PER_SEC = 0; - -void hiclock_init() -{ - LARGE_INTEGER freq; - QueryPerformanceFrequency(&freq); - HICLOCKS_PER_SEC = freq.QuadPart; -} -#endif - -hiclock_t hiclock() -{ -#if defined(__unix__) - struct timeval clocks; - gettimeofday(&clocks, NULL); - return ((uint64_t)clocks.tv_sec * 1000000ULL) + clocks.tv_usec; -#elif defined(__WIN32) || defined(__WIN64) - LARGE_INTEGER clocks; - QueryPerformanceCounter(&clocks); - return clocks.QuadPart; -#else - return clock(); -#endif -} +#include "hiclock.h" +#include + +#if defined(__WIN32) || defined(__WIN64) +LONGLONG HICLOCKS_PER_SEC = 0; + +void hiclock_init() +{ + LARGE_INTEGER freq; + QueryPerformanceFrequency(&freq); + HICLOCKS_PER_SEC = freq.QuadPart; +} +#endif + +hiclock_t hiclock() +{ +#if defined(__unix__) + struct timeval clocks; + gettimeofday(&clocks, NULL); + return ((uint64_t)clocks.tv_sec * 1000000ULL) + clocks.tv_usec; +#elif defined(__WIN32) || defined(__WIN64) + LARGE_INTEGER clocks; + QueryPerformanceCounter(&clocks); + return clocks.QuadPart; +#else + return clock(); +#endif +} diff --git a/Client/ThirdParty/libfixmath/fixtest/hiclock.h b/Client/ThirdParty/libfixmath/fixtest/hiclock.h index 7cabf47..89e32c8 100644 --- a/Client/ThirdParty/libfixmath/fixtest/hiclock.h +++ b/Client/ThirdParty/libfixmath/fixtest/hiclock.h @@ -1,33 +1,33 @@ -#ifndef __hiclock_h__ -#define __hiclock_h__ - -#include -#include - -#if defined(__unix__) -#include -#define PRIuHICLOCK PRIu64 -#define PRIiHICLOCK PRIi64 -typedef uint64_t hiclock_t; -#define HICLOCKS_PER_SEC 1000000 -#define hiclock_init() -#elif defined(__WIN32) || defined(__WIN64) -#include -#define PRIuHICLOCK PRIu64 -#define PRIiHICLOCK PRIi64 -typedef LONGLONG hiclock_t; -extern LONGLONG HICLOCKS_PER_SEC; -extern void hiclock_init(); -#else -#include -#define PRIuHICLOCK PRIu32 -#define PRIiHICLOCK PRIi32 -typedef clock_t hiclock_t; -#define HICLOCKS_PER_SEC CLOCKS_PER_SEC -#define hiclock_init() -#endif - -extern hiclock_t hiclock(); - -#endif - +#ifndef __hiclock_h__ +#define __hiclock_h__ + +#include +#include + +#if defined(__unix__) +#include +#define PRIuHICLOCK PRIu64 +#define PRIiHICLOCK PRIi64 +typedef uint64_t hiclock_t; +#define HICLOCKS_PER_SEC 1000000 +#define hiclock_init() +#elif defined(__WIN32) || defined(__WIN64) +#include +#define PRIuHICLOCK PRIu64 +#define PRIiHICLOCK PRIi64 +typedef LONGLONG hiclock_t; +extern LONGLONG HICLOCKS_PER_SEC; +extern void hiclock_init(); +#else +#include +#define PRIuHICLOCK PRIu32 +#define PRIiHICLOCK PRIi32 +typedef clock_t hiclock_t; +#define HICLOCKS_PER_SEC CLOCKS_PER_SEC +#define hiclock_init() +#endif + +extern hiclock_t hiclock(); + +#endif + diff --git a/Client/ThirdParty/libfixmath/fixtest/main.c b/Client/ThirdParty/libfixmath/fixtest/main.c index 822f290..5f6dd92 100644 --- a/Client/ThirdParty/libfixmath/fixtest/main.c +++ b/Client/ThirdParty/libfixmath/fixtest/main.c @@ -1,96 +1,96 @@ -#include "hiclock.h" -#include -#include -#include -#include -#include -#include - -#define EXP -//#define ATAN -//#define SIN -//#define SQRT - -#ifdef EXP -#define fix_func fix16_exp -#define fix_func_str "fix16_exp" -#define flt_func expf -#define flt_func_str "expf" -#endif - -#ifdef ATAN -#define fix_func fix16_atan -#define fix_func_str "fix16_atan" -#define flt_func atanf -#define flt_func_str "atanf" -#endif - -#ifdef SIN -#define fix_func fix16_sin -#define fix_func_str "fix16_sin" -#define flt_func sinf -#define flt_func_str "sinf" -#endif - -#ifdef SQRT -#define fix_func fix16_sqrt -#define fix_func_str "fix16_sqrt" -#define flt_func sqrtf -#define flt_func_str "sqrtf" -#endif - -int main(int argc, char **argv) -{ - printf("libfixmath test tool\n"); - - hiclock_init(); - - uintptr_t args = (1 << 8); - uintptr_t iter = (1 << 8); - uintptr_t pass = (1 << 8); - - uintptr_t i; - srand(time(NULL)); - - hiclock_t fix_duration = 0; - hiclock_t flt_duration = 0; - fix16_t fix_error = 0; - - uintptr_t k; - for (k = 0; k < pass; k++) - { - fix16_t fix_args[args]; - for (i = 0; i < args; i++) fix_args[i] = (rand() ^ (rand() << 16)); - fix16_t fix_result[args]; - hiclock_t fix_start = hiclock(); - for (i = 0; i < iter; i++) - { - uintptr_t j; - for (j = 0; j < args; j++) fix_result[j] = fix_func(fix_args[j]); - } - hiclock_t fix_end = hiclock(); - - float flt_args[args]; - for (i = 0; i < args; i++) flt_args[i] = fix16_to_float(fix_args[i]); - float flt_result[args]; - hiclock_t flt_start = hiclock(); - for (i = 0; i < iter; i++) - { - uintptr_t j; - for (j = 0; j < args; j++) flt_result[j] = flt_func(flt_args[j]); - } - hiclock_t flt_end = hiclock(); - - for (i = 0; i < args; i++) - fix_error += abs(fix16_from_float(flt_result[i]) - fix_result[i]); - flt_duration += (flt_end - flt_start); - fix_duration += (fix_end - fix_start); - } - - printf("%16s: %08" PRIuHICLOCK " @ %" PRIu32 "Hz\n", flt_func_str, flt_duration, HICLOCKS_PER_SEC); - printf("%16s: %08" PRIuHICLOCK " @ %" PRIu32 "Hz\n", fix_func_str, fix_duration, HICLOCKS_PER_SEC); - printf(" Difference: %08" PRIiHICLOCK " (% 3.2f%%)\n", (flt_duration - fix_duration), ((fix_duration * 100.0) / flt_duration)); - printf(" Error: %f%%\n", ((fix16_to_dbl(fix_error) * 100.0) / (args * pass))); - - return EXIT_SUCCESS; -} +#include "hiclock.h" +#include +#include +#include +#include +#include +#include + +#define EXP +//#define ATAN +//#define SIN +//#define SQRT + +#ifdef EXP +#define fix_func fix16_exp +#define fix_func_str "fix16_exp" +#define flt_func expf +#define flt_func_str "expf" +#endif + +#ifdef ATAN +#define fix_func fix16_atan +#define fix_func_str "fix16_atan" +#define flt_func atanf +#define flt_func_str "atanf" +#endif + +#ifdef SIN +#define fix_func fix16_sin +#define fix_func_str "fix16_sin" +#define flt_func sinf +#define flt_func_str "sinf" +#endif + +#ifdef SQRT +#define fix_func fix16_sqrt +#define fix_func_str "fix16_sqrt" +#define flt_func sqrtf +#define flt_func_str "sqrtf" +#endif + +int main(int argc, char **argv) +{ + printf("libfixmath test tool\n"); + + hiclock_init(); + + uintptr_t args = (1 << 8); + uintptr_t iter = (1 << 8); + uintptr_t pass = (1 << 8); + + uintptr_t i; + srand(time(NULL)); + + hiclock_t fix_duration = 0; + hiclock_t flt_duration = 0; + fix16_t fix_error = 0; + + uintptr_t k; + for (k = 0; k < pass; k++) + { + fix16_t fix_args[args]; + for (i = 0; i < args; i++) fix_args[i] = (rand() ^ (rand() << 16)); + fix16_t fix_result[args]; + hiclock_t fix_start = hiclock(); + for (i = 0; i < iter; i++) + { + uintptr_t j; + for (j = 0; j < args; j++) fix_result[j] = fix_func(fix_args[j]); + } + hiclock_t fix_end = hiclock(); + + float flt_args[args]; + for (i = 0; i < args; i++) flt_args[i] = fix16_to_float(fix_args[i]); + float flt_result[args]; + hiclock_t flt_start = hiclock(); + for (i = 0; i < iter; i++) + { + uintptr_t j; + for (j = 0; j < args; j++) flt_result[j] = flt_func(flt_args[j]); + } + hiclock_t flt_end = hiclock(); + + for (i = 0; i < args; i++) + fix_error += abs(fix16_from_float(flt_result[i]) - fix_result[i]); + flt_duration += (flt_end - flt_start); + fix_duration += (fix_end - fix_start); + } + + printf("%16s: %08" PRIuHICLOCK " @ %" PRIu32 "Hz\n", flt_func_str, flt_duration, HICLOCKS_PER_SEC); + printf("%16s: %08" PRIuHICLOCK " @ %" PRIu32 "Hz\n", fix_func_str, fix_duration, HICLOCKS_PER_SEC); + printf(" Difference: %08" PRIiHICLOCK " (% 3.2f%%)\n", (flt_duration - fix_duration), ((fix_duration * 100.0) / flt_duration)); + printf(" Error: %f%%\n", ((fix16_to_dbl(fix_error) * 100.0) / (args * pass))); + + return EXIT_SUCCESS; +} -- cgit v1.1-26-g67d0