Workaround for inttypes.h. Fixes #938

On some systems this requires a macro to be set.
Where feasible, replace int-sized printf args with static_cast<int>.

PiperOrigin-RevId: 469708467

Author: jan-wassenberg

hwy/contrib/image/image.h

@@ -18,7 +18,6 @@
 
 // SIMD/multicore-friendly planar image representation with row accessors.
 
-#include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
@@ -104,7 +103,7 @@ struct HWY_CONTRIB_DLLEXPORT ImageBase {
   HWY_INLINE void* VoidRow(const size_t y) const {
 #if HWY_IS_ASAN || HWY_IS_MSAN || HWY_IS_TSAN
     if (y >= ysize_) {
-      HWY_ABORT("Row(%" PRIu64 ") >= %u\n", static_cast<uint64_t>(y), ysize_);
+      HWY_ABORT("Row(%d) >= %u\n", static_cast<int>(y), ysize_);
     }
 #endif
 
@@ -223,14 +222,11 @@ class Image3 {
 
   Image3(ImageT&& plane0, ImageT&& plane1, ImageT&& plane2) {
     if (!SameSize(plane0, plane1) || !SameSize(plane0, plane2)) {
-      HWY_ABORT("Not same size: %" PRIu64 " x %" PRIu64 ", %" PRIu64
-                " x %" PRIu64 ", %" PRIu64 " x %" PRIu64 "\n",
-                static_cast<uint64_t>(plane0.xsize()),
-                static_cast<uint64_t>(plane0.ysize()),
-                static_cast<uint64_t>(plane1.xsize()),
-                static_cast<uint64_t>(plane1.ysize()),
-                static_cast<uint64_t>(plane2.xsize()),
-                static_cast<uint64_t>(plane2.ysize()));
+      HWY_ABORT(
+          "Not same size: %d x %d, %d x %d, %d x %d\n",
+          static_cast<int>(plane0.xsize()), static_cast<int>(plane0.ysize()),
+          static_cast<int>(plane1.xsize()), static_cast<int>(plane1.ysize()),
+          static_cast<int>(plane2.xsize()), static_cast<int>(plane2.ysize()));
     }
     planes_[0] = std::move(plane0);
     planes_[1] = std::move(plane1);
@@ -294,9 +290,8 @@ class Image3 {
   HWY_INLINE void* VoidPlaneRow(const size_t c, const size_t y) const {
 #if HWY_IS_ASAN || HWY_IS_MSAN || HWY_IS_TSAN
     if (c >= kNumPlanes || y >= ysize()) {
-      HWY_ABORT("PlaneRow(%" PRIu64 ", %" PRIu64 ") >= %" PRIu64 "\n",
-                static_cast<uint64_t>(c), static_cast<uint64_t>(y),
-                static_cast<uint64_t>(ysize()));
+      HWY_ABORT("PlaneRow(%d, %d) >= %d\n", static_cast<int>(c),
+                static_cast<int>(y), static_cast<int>(ysize()));
     }
 #endif
     // Use the first plane's stride because the compiler might not realize they

hwy/contrib/math/math_test.cc

@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS  // before inttypes.h
+#endif
+#include <inttypes.h>
 #include <stdio.h>
 
 #include <cfloat>  // FLT_MAX

hwy/contrib/sort/sort_test.cc

@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS  // before inttypes.h
+#endif
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>  // memcpy

hwy/examples/benchmark.cc

@@ -13,6 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS  // before inttypes.h
+#endif
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>

hwy/nanobenchmark.cc

@@ -15,6 +15,9 @@
 
 #include "hwy/nanobenchmark.h"
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS  // before inttypes.h
+#endif
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdio.h>

hwy/nanobenchmark_test.cc

@@ -15,6 +15,9 @@
 
 #include "hwy/nanobenchmark.h"
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS  // before inttypes.h
+#endif
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>

hwy/print.cc

@@ -15,6 +15,9 @@
 
 #include "hwy/print.h"
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS  // before inttypes.h
+#endif
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdio.h>

hwy/targets.cc

@@ -15,6 +15,9 @@
 
 #include "hwy/targets.h"
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS  // before inttypes.h
+#endif
 #include <inttypes.h>  // PRIx64
 #include <stdarg.h>
 #include <stddef.h>

hwy/tests/arithmetic_test.cc

@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
 

hwy/tests/compress_test.cc

@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <inttypes.h>  // PRIu64
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>  // memset
@@ -44,19 +43,16 @@ void CheckStored(D d, DI di, size_t expected_pos, size_t actual_pos,
                  const AlignedFreeUniquePtr<T[]>& expected, const T* actual_u,
                  int line) {
   if (expected_pos != actual_pos) {
-    hwy::Abort(
-        __FILE__, line,
-        "Size mismatch for %s: expected %" PRIu64 ", actual %" PRIu64 "\n",
-        TypeName(T(), Lanes(d)).c_str(), static_cast<uint64_t>(expected_pos),
-        static_cast<uint64_t>(actual_pos));
+    hwy::Abort(__FILE__, line, "Size mismatch for %s: expected %d, actual %d\n",
+               TypeName(T(), Lanes(d)).c_str(), static_cast<int>(expected_pos),
+               static_cast<int>(actual_pos));
   }
   // Modified from AssertVecEqual - we may not be checking all lanes.
   for (size_t i = 0; i < num_to_check; ++i) {
     if (!IsEqual(expected[i], actual_u[i])) {
       const size_t N = Lanes(d);
-      fprintf(stderr, "Mismatch at i=%" PRIu64 " of %" PRIu64 ", line %d:\n\n",
-              static_cast<uint64_t>(i), static_cast<uint64_t>(num_to_check),
-              line);
+      fprintf(stderr, "Mismatch at i=%d of %d, line %d:\n\n",
+              static_cast<int>(i), static_cast<int>(num_to_check), line);
       Print(di, "mask", Load(di, mask_lanes.get()), 0, N);
       Print(d, "in", Load(d, in.get()), 0, N);
       Print(d, "expect", Load(d, expected.get()), 0, N);
@@ -598,8 +594,7 @@ void PrintCompress32x4Tables() {
 
     for (size_t i = 0; i < N; ++i) {
       for (size_t idx_byte = 0; idx_byte < sizeof(T); ++idx_byte) {
-        printf("%" PRIu64 ",",
-               static_cast<uint64_t>(sizeof(T) * indices[i] + idx_byte));
+        printf("%d,", static_cast<int>(sizeof(T) * indices[i] + idx_byte));
       }
     }
   }
@@ -630,8 +625,7 @@ void PrintCompressNot32x4Tables() {
 
     for (size_t i = 0; i < N; ++i) {
       for (size_t idx_byte = 0; idx_byte < sizeof(T); ++idx_byte) {
-        printf("%" PRIu64 ",",
-               static_cast<uint64_t>(sizeof(T) * indices[i] + idx_byte));
+        printf("%d,", static_cast<int>(sizeof(T) * indices[i] + idx_byte));
       }
     }
   }
@@ -662,8 +656,7 @@ void PrintCompress64x2Tables() {
 
     for (size_t i = 0; i < N; ++i) {
       for (size_t idx_byte = 0; idx_byte < sizeof(T); ++idx_byte) {
-        printf("%" PRIu64 ",",
-               static_cast<uint64_t>(sizeof(T) * indices[i] + idx_byte));
+        printf("%d,", static_cast<int>(sizeof(T) * indices[i] + idx_byte));
       }
     }
   }
@@ -694,8 +687,7 @@ void PrintCompressNot64x2Tables() {
 
     for (size_t i = 0; i < N; ++i) {
       for (size_t idx_byte = 0; idx_byte < sizeof(T); ++idx_byte) {
-        printf("%" PRIu64 ",",
-               static_cast<uint64_t>(sizeof(T) * indices[i] + idx_byte));
+        printf("%d,", static_cast<int>(sizeof(T) * indices[i] + idx_byte));
       }
     }
   }