changeset 52202:d1a1a5af1239

8171097: Convert TestReservedSpace_test to Gtest Reviewed-by: stuefe, jcbeyler, iignatyev
author kzhaldyb
date Fri, 19 Oct 2018 16:29:43 -0700
parents 7c6dfd16373f
children 5e894b0f5e63
files src/hotspot/share/utilities/internalVMTests.cpp test/hotspot/gtest/memory/test_virtualspace.cpp
diffstat 2 files changed, 192 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/utilities/internalVMTests.cpp	Fri Oct 19 18:05:50 2018 -0700
+++ b/src/hotspot/share/utilities/internalVMTests.cpp	Fri Oct 19 16:29:43 2018 -0700
@@ -42,7 +42,6 @@
 
 void InternalVMTests::run() {
   tty->print_cr("Running internal VM tests");
-  run_unit_test(TestReservedSpace_test);
   run_unit_test(TestReserveMemorySpecial_test);
   run_unit_test(TestVirtualSpace_test);
   run_unit_test(TestMetaspaceUtils_test);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/gtest/memory/test_virtualspace.cpp	Fri Oct 19 16:29:43 2018 -0700
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "memory/virtualspace.hpp"
+#include "runtime/os.hpp"
+#include "oops/oop.hpp"
+#include "utilities/align.hpp"
+#include "unittest.hpp"
+
+namespace {
+  class MemoryReleaser {
+    ReservedSpace* const _rs;
+   public:
+    MemoryReleaser(ReservedSpace* rs) : _rs(rs) { }
+    ~MemoryReleaser() {
+      if (_rs->special()) {
+        EXPECT_TRUE(os::release_memory_special(_rs->base(), _rs->size()));
+      } else {
+        EXPECT_TRUE(os::release_memory(_rs->base(), _rs->size()));
+      }
+    }
+  };
+
+  static void small_page_write(void* addr, size_t size) {
+    size_t page_size = os::vm_page_size();
+
+    char* end = (char*) addr + size;
+    for (char* p = (char*) addr; p < end; p += page_size) {
+      *p = 1;
+    }
+  }
+
+  // have to use these functions, as gtest's _PRED macros don't like is_aligned
+  // nor (is_aligned<size_t, size_t>)
+  static bool is_size_aligned(size_t size, size_t alignment) {
+    return is_aligned(size, alignment);
+  }
+  static bool is_ptr_aligned(void* ptr, size_t alignment) {
+    return is_aligned(ptr, alignment);
+  }
+
+  static void test_reserved_size(size_t size) {
+    ASSERT_PRED2(is_size_aligned, size, os::vm_allocation_granularity());
+
+    ReservedSpace rs(size);
+    MemoryReleaser releaser(&rs);
+
+    EXPECT_TRUE(rs.base() != NULL) << "rs.special: " << rs.special();
+    EXPECT_EQ(size, rs.size()) << "rs.special: " << rs.special();
+
+    if (rs.special()) {
+      small_page_write(rs.base(), size);
+    }
+  }
+
+  static void test_reserved_size_alignment(size_t size, size_t alignment) {
+    ASSERT_PRED2(is_size_aligned, size, alignment) << "Incorrect input parameters";
+
+    ReservedSpace rs(size, alignment, UseLargePages, (char *) NULL);
+
+    ASSERT_TRUE(rs.base() != NULL) << "rs.special = " << rs.special();
+    ASSERT_EQ(size, rs.size()) << "rs.special = " << rs.special();
+
+    EXPECT_PRED2(is_ptr_aligned, rs.base(), alignment)
+            << "aligned sizes should always give aligned addresses";
+    EXPECT_PRED2(is_ptr_aligned, (void*) rs.size(), alignment)
+            << "aligned sizes should always give aligned addresses";
+
+    if (rs.special()) {
+      small_page_write(rs.base(), size);
+    }
+  }
+
+  static void test_reserved_size_alignment_page_type(size_t size, size_t alignment, bool maybe_large) {
+    if (size < alignment) {
+      // Tests might set -XX:LargePageSizeInBytes=<small pages> and cause unexpected input arguments for this test.
+      ASSERT_EQ((size_t) os::vm_page_size(), os::large_page_size()) << "Test needs further refinement";
+      return;
+    }
+
+    ASSERT_PRED2(is_size_aligned, size, os::vm_allocation_granularity()) << "Must be at least AG aligned";
+    ASSERT_PRED2(is_size_aligned, size, alignment) << "Must be at least AG aligned";
+
+    bool large = maybe_large && UseLargePages && size >= os::large_page_size();
+
+    ReservedSpace rs(size, alignment, large, false);
+    MemoryReleaser releaser(&rs);
+
+    EXPECT_TRUE(rs.base() != NULL) << "rs.special: " << rs.special();
+    EXPECT_EQ(size, rs.size()) << "rs.special: " << rs.special();
+
+    if (rs.special()) {
+      small_page_write(rs.base(), size);
+    }
+  }
+}
+
+TEST_VM(ReservedSpace, size_alignment) {
+  size_t size = 2 * 1024 * 1024;
+  size_t ag   = os::vm_allocation_granularity();
+
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment(size,      ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment(size * 2,  ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment(size * 10, ag));
+}
+
+TEST_VM(ReservedSpace, size) {
+  size_t size = 2 * 1024 * 1024;
+  size_t ag = os::vm_allocation_granularity();
+
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 1));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 2));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 10));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size - ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size + ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 2));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 2 - ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 2 + ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 3));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 3 - ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 3 + ag));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 10));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size(size * 10 + size / 2));
+}
+
+TEST_VM(ReservedSpace, size_alignment_page_type) {
+  size_t ag = os::vm_allocation_granularity();
+
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag,      ag    , false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 2,  ag    , false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 3,  ag    , false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 2,  ag * 2, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 4,  ag * 2, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 8,  ag * 2, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 4,  ag * 4, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 8,  ag * 4, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(ag * 16, ag * 4, false));
+}
+
+TEST_VM(ReservedSpace, size_alignment_page_type_large_page) {
+  if (!UseLargePages) {
+    return;
+  }
+
+  size_t ag = os::vm_allocation_granularity();
+  size_t lp = os::large_page_size();
+
+  // Without large pages
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp,     ag * 4, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 2, ag * 4, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 4, ag * 4, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp,     lp    , false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 2, lp    , false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 3, lp    , false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 2, lp * 2, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 4, lp * 2, false));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 8, lp * 2, false));
+
+  // With large pages
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp, ag * 4    , true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 2, ag * 4, true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 4, ag * 4, true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp, lp        , true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 2, lp    , true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 3, lp    , true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 2, lp * 2, true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 4, lp * 2, true));
+  EXPECT_NO_FATAL_FAILURE(test_reserved_size_alignment_page_type(lp * 8, lp * 2, true));
+}