[libcxx-commits] [PATCH] D141623: [SystemZ][z/OS] Fix cityhash lit for EBCDIC

[Zibi Sarbino via Phabricator via libcxx-commits]

zibi updated this revision to Diff 489094.
zibi added a comment.

Addressing comments ...


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141623/new/

https://reviews.llvm.org/D141623

Files:
  libcxx/test/libcxx/utilities/utility/__murmur2_or_cityhash.pass.cpp


Index: libcxx/test/libcxx/utilities/utility/__murmur2_or_cityhash.pass.cpp
===================================================================
--- libcxx/test/libcxx/utilities/utility/__murmur2_or_cityhash.pass.cpp
+++ libcxx/test/libcxx/utilities/utility/__murmur2_or_cityhash.pass.cpp
@@ -20,22 +20,19 @@
 #  define CHOOSE_BY_ENDIANESS(little, big) (big)
 #endif
 
-#if !defined(__MVS__) || defined(__NATIVE_ASCII_F)
-#  define CHOOSE_BY_CODEPAGE(ascii, ebcdic) (ascii)
-#else
-#  define CHOOSE_BY_CODEPAGE(ascii, ebcdic) (ebcdic)
-#endif
+std::string CityHash[] = {
+    {/* "abcdefgh" */ "\x61\x62\x63\x64\x65\x66\x67\x68"},
+    {/* "abcDefgh" */ "\x61\x62\x63\x44\x65\x66\x67\x68"},
+    {/* "CityHash" */ "\x43\x69\x74\x79\x48\x61\x73\x68"},
+    {/* "CitYHash" */ "\x43\x69\x74\x59\x48\x61\x73\x68"},
+};
 
 int main(int, char**) {
   const std::pair<std::string, uint64_t> TestCases[] = {
-      {"abcdefgh",
-       CHOOSE_BY_ENDIANESS(0x4382a8d0fe8edb17ULL, CHOOSE_BY_CODEPAGE(0xca84e809bef16fbcULL, 0xb6eaf957b2d7afdfULL))},
-      {"abcDefgh",
-       CHOOSE_BY_ENDIANESS(0xecefb080a6854061ULL, CHOOSE_BY_CODEPAGE(0xd7feb824250272dcULL, 0x1289b4221ba2f29aULL))},
-      {"CityHash",
-       CHOOSE_BY_ENDIANESS(0x169ea3aebf908d6dULL, CHOOSE_BY_CODEPAGE(0xea8cef3ca6f6e368ULL, 0x9a4dc95b4eac9cb8ULL))},
-      {"CitYHash",
-       CHOOSE_BY_ENDIANESS(0xe18298a2760f09faULL, CHOOSE_BY_CODEPAGE(0xf33a7700bb7a94a8ULL, 0x8162652f9d2f3a7aULL))},
+      {CityHash[0], CHOOSE_BY_ENDIANESS(0x4382a8d0fe8edb17ULL, 0xca84e809bef16fbcULL)},
+      {CityHash[1], CHOOSE_BY_ENDIANESS(0xecefb080a6854061ULL, 0xd7feb824250272dcULL)},
+      {CityHash[2], CHOOSE_BY_ENDIANESS(0x169ea3aebf908d6dULL, 0xea8cef3ca6f6e368ULL)},
+      {CityHash[3], CHOOSE_BY_ENDIANESS(0xe18298a2760f09faULL, 0xf33a7700bb7a94a8ULL)},
   };
 
   std::__murmur2_or_cityhash<uint64_t> h64;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D141623.489094.patch
Type: text/x-patch
Size: 1863 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230113/64be4381/attachment.bin>