Permalink
Browse files

fixed benchmarks build and cleanup U64 and S64 macro definition, it i…

…s now in standard (nw)
  • Loading branch information...
1 parent ab9fd24 commit 346a42383e267d087900bff7df72609c20f9ff5f @mmicko mmicko committed Oct 22, 2016
Showing with 2 additions and 10 deletions.
  1. +1 −1 benchmarks/eminline_native.cpp
  2. +1 −1 benchmarks/eminline_noasm.cpp
  3. +0 −8 src/osd/osdcomm.h
@@ -3,7 +3,7 @@
#include "osdcore.h"
#include "eminline.h"
static void BM_count_leading_zeros_native(benchmark::State& state) {
- UINT32 cnt = 0x332533;
+ uint32_t cnt = 0x332533;
while (state.KeepRunning()) {
(void)count_leading_zeros(cnt);
cnt++;
@@ -11,7 +11,7 @@ osd_ticks_t osd_ticks(void)
#include "eminline.h"
static void BM_count_leading_zeros_noasm(benchmark::State& state) {
- UINT32 cnt = 0x332533;
+ uint32_t cnt = 0x332533;
while (state.KeepRunning()) {
(void)count_leading_zeros(cnt);
cnt++;
View
@@ -89,21 +89,13 @@ using std::int64_t;
#define FALSE 0
#endif
-
-
/***************************************************************************
FUNDAMENTAL MACROS
***************************************************************************/
/* U64 and S64 are used to wrap long integer constants. */
-#if defined(__GNUC__) || defined(_MSC_VER)
#define U64(val) val##ULL
#define S64(val) val##LL
-#else
-#define U64(val) val
-#define S64(val) val
-#endif
-
/* Concatenate/extract 32-bit halves of 64-bit values */
constexpr uint64_t concat_64(uint32_t hi, uint32_t lo) { return (uint64_t(hi) << 32) | uint32_t(lo); }

0 comments on commit 346a423

Please sign in to comment.