Skip to contentSkip to conversation

tests/qht-bench: Fix Clang 'implicit-int-float-conversion' warning

PATCH In review Philippe Mathieu-Daudé 3 participants 3 messages May 4, 2020 – May 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 tests/qht-bench: Fix Clang 'implicit-int-float-conversion' warning

When building with Clang 10 on Fedora 32, we get:

tests/qht-bench.c:287:29: error: implicit conversion from 'unsigned long' to 'double' changes value from 18446744073709551615 to 18446744073709551616 [-Werror,-Wimplicit-int-float-conversion]

          *threshold = rate * UINT64_MAX;
                            ~ ^~~~~~~~~~
  /usr/include/stdint.h:130:23: note: expanded from macro 'UINT64_MAX'
  # define UINT64_MAX             (__UINT64_C(18446744073709551615))
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  /usr/include/stdint.h:107:25: note: expanded from macro '__UINT64_C'
  #  define __UINT64_C(c) c ## UL
                          ^~~~~~~
  <scratch space>:14:1: note: expanded from here
  18446744073709551615UL
  ^~~~~~~~~~~~~~~~~~~~~~

Fix by using nextafter() from <math.h>:

double nextafter( double from, double to );

Returns the next representable value of 'from' in the direction of 'to'.

---
Supersedes: <[email protected]>

Since v2: corrected patch subject
Since v1: nextafterf() -> nextafter()

Cc Emilio G. Cota <[email protected]>
Cc Alex Bennée <[email protected]>
Cc Richard Henderson <[email protected]>
Cc Alexander Bulekov <[email protected]>
---
 tests/qht-bench.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tests/qht-bench.c +2 -1
index e3b512f26f..54ce1e8188 100644
@@ -10,6 +10,7 @@
 #include "qemu/qht.h"
 #include "qemu/rcu.h"
 #include "qemu/xxhash.h"
+#include <math.h>
 
 struct thread_stats {
     size_t rd;
@@ -284,7 +285,7 @@ static void do_threshold(double rate, uint64_t *threshold)
     if (rate == 1.0) {
         *threshold = UINT64_MAX;
     } else {
-        *threshold = rate * UINT64_MAX;
+        *threshold = rate * nextafter(0x1p64, 0.0);
     }
 }
 
Signature · 1 line
2.21.3
#1 lore raw
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

Reviewed-by on v3 1/1
#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 3 lines · Philippe Mathieu-Daudé

When building with Clang 10 on Fedora 32, we get:

tests/qht-bench.c:287:29: error: implicit conversion from 'unsigned long' to 'double' changes value from 18446744073709551615 to 18446744073709551616 [-Werror,-Wimplicit-int-float-conversion]

(snip)

tests/qht-bench.c static void do_threshold(double rate, uint64_t *threshold) · line 288

Quoted 6 lines
tests/qht-bench.c +1 -1
@@ -284,7 +285,7 @@ static void do_threshold(double rate, uint64_t *threshold)
     if (rate == 1.0) {
         *threshold = UINT64_MAX;
     } else {
-        *threshold = rate * UINT64_MAX;
+        *threshold = rate * nextafter(0x1p64, 0.0);

Please consider mentioning 25f74087c69 in the commit log -- it clearly describes the problem.

Thanks,

Emilio