fix ci failures

Author: dipinhora

benchmark/libponyrt/mem/pool.cc

@@ -4,13 +4,6 @@
 
 #define LARGE_ALLOC ponyint_pool_adjust_size(POOL_MAX + 1)
 
-/// When we mmap, pull at least this many bytes.
-#ifdef PLATFORM_IS_ILP32
-#define POOL_MMAP (16 * 1024 * 1024) // 16 MB
-#else
-#define POOL_MMAP (128 * 1024 * 1024) // 128 MB
-#endif
-
 typedef char block_t[32];
 
 class PoolBench: public ::benchmark::Fixture

src/libponyrt/mem/pool.h

@@ -32,7 +32,12 @@ PONY_EXTERN_C_BEGIN
  * and 16 bytes for the memalign and message passing pool implementations.
  */
 
+#ifndef POOL_USE_DEFAULT
+#define POOL_MIN_BITS 4
+#else
 #define POOL_MIN_BITS 5
+#endif
+
 #define POOL_MAX_BITS 20
 #define POOL_ALIGN_BITS 10
 
@@ -57,6 +62,28 @@ size_t ponyint_pool_used_size(size_t index);
 
 size_t ponyint_pool_adjust_size(size_t size);
 
+#ifndef POOL_USE_DEFAULT
+#define POOL_INDEX(SIZE) \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 0)), 0, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 1)), 1, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 2)), 2, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 3)), 3, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 4)), 4, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 5)), 5, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 6)), 6, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 7)), 7, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 8)), 8, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 9)), 9, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 10)), 10, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 11)), 11, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 12)), 12, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 13)), 13, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 14)), 14, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 15)), 15, \
+  __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 16)), 16, \
+    EXPR_NONE \
+    )))))))))))))))))
+#else
 #define POOL_INDEX(SIZE) \
   __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 0)), 0, \
   __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 1)), 1, \
@@ -76,6 +103,7 @@ size_t ponyint_pool_adjust_size(size_t size);
   __pony_choose_expr(SIZE <= (1 << (POOL_MIN_BITS + 15)), 15, \
     EXPR_NONE \
     ))))))))))))))))
+#endif
 
 #define POOL_ALLOC(TYPE) \
   (TYPE*) ponyint_pool_alloc(POOL_INDEX(sizeof(TYPE)))

test/libponyrt/mem/pool.cc

@@ -77,26 +77,53 @@ TEST(Pool, LargeAlloc)
 
 TEST(Pool, Index)
 {
+  size_t expected_index = 0;
   size_t index = ponyint_pool_index(1);
   ASSERT_TRUE(index == 0);
 
+  index = ponyint_pool_index(7);
+  ASSERT_TRUE(index == expected_index);
+
+  index = ponyint_pool_index(8);
+  ASSERT_TRUE(index == expected_index);
+
+  index = ponyint_pool_index(9);
+  ASSERT_TRUE(index == expected_index);
+
+  index = ponyint_pool_index(15);
+  ASSERT_TRUE(index == expected_index);
+
+  index = ponyint_pool_index(16);
+  ASSERT_TRUE(index == expected_index);
+
+#ifndef POOL_USE_DEFAULT
+  expected_index++;
+#endif
+
+  index = ponyint_pool_index(17);
+  ASSERT_TRUE(index == expected_index);
+
   index = ponyint_pool_index(31);
-  ASSERT_TRUE(index == 0);
+  ASSERT_TRUE(index == expected_index);
 
   index = ponyint_pool_index(32);
-  ASSERT_TRUE(index == 0);
+  ASSERT_TRUE(index == expected_index);
+
+  expected_index++;
 
   index = ponyint_pool_index(33);
-  ASSERT_TRUE(index == 1);
+  ASSERT_TRUE(index == expected_index);
 
   index = ponyint_pool_index(63);
-  ASSERT_TRUE(index == 1);
+  ASSERT_TRUE(index == expected_index);
 
   index = ponyint_pool_index(64);
-  ASSERT_TRUE(index == 1);
+  ASSERT_TRUE(index == expected_index);
+
+  expected_index++;
 
   index = ponyint_pool_index(65);
-  ASSERT_TRUE(index == 2);
+  ASSERT_TRUE(index == expected_index);
 
   index = ponyint_pool_index(POOL_MAX - 1);
   ASSERT_TRUE(index == POOL_COUNT - 1);