--- old/test/hotspot/jtreg/compiler/intrinsics/math/TestFpMinMaxIntrinsics.java	2019-02-16 20:56:36.941822536 +0530
+++ new/test/hotspot/jtreg/compiler/intrinsics/math/TestFpMinMaxIntrinsics.java	2019-02-16 20:56:36.737822531 +0530
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Arm Limited. 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
@@ -36,6 +36,10 @@
  *                   -Xcomp -XX:-TieredCompilation
  *                   -XX:CompileOnly=java/lang/Math
  *                   compiler.intrinsics.math.TestFpMinMaxIntrinsics
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:-TieredCompilation -XX:CompileThresholdScaling=0.1
+ *                   -XX:CompileCommand=print,compiler/intrinsics/math/TestFpMinMaxIntrinsics.*Test*
+ *                   compiler.intrinsics.math.TestFpMinMaxIntrinsics
  */
 
 package compiler.intrinsics.math;
@@ -64,24 +68,46 @@
         //     a         b         min       max
         {     fPos,     fPos,     fPos,     fPos },
         {     fPos,     fNeg,     fNeg,     fPos },
+
         { fPosZero, fNegZero, fNegZero, fPosZero },
+        { fNegZero, fPosZero, fNegZero, fPosZero },
         { fNegZero, fNegZero, fNegZero, fNegZero },
+
         {     fPos,  fPosInf,     fPos,  fPosInf },
         {     fNeg,  fNegInf,  fNegInf,     fNeg },
+
         {     fPos,     fNaN,     fNaN,     fNaN },
+        {     fNaN,     fPos,     fNaN,     fNaN },
+        {     fNeg,     fNaN,     fNaN,     fNaN },
+        {     fNaN,     fNeg,     fNaN,     fNaN },
+
+        {  fPosInf,     fNaN,     fNaN,     fNaN },
+        {     fNaN,  fPosInf,     fNaN,     fNaN },
         {  fNegInf,     fNaN,     fNaN,     fNaN },
+        {     fNaN,  fNegInf,     fNaN,     fNaN }
     };
 
     private static final double[][] d_cases = {
         //     a         b         min       max
         {     dPos,     dPos,     dPos,     dPos },
         {     dPos,     dNeg,     dNeg,     dPos },
+
         { dPosZero, dNegZero, dNegZero, dPosZero },
+        { dNegZero, dPosZero, dNegZero, dPosZero },
         { dNegZero, dNegZero, dNegZero, dNegZero },
+
         {     dPos,  dPosInf,     dPos,  dPosInf },
         {     dNeg,  dNegInf,  dNegInf,     dNeg },
+
         {     dPos,     dNaN,     dNaN,     dNaN },
+        {     dNaN,     dPos,     dNaN,     dNaN },
+        {     dNeg,     dNaN,     dNaN,     dNaN },
+        {     dNaN,     dNeg,     dNaN,     dNaN },
+
+        {  dPosInf,     dNaN,     dNaN,     dNaN },
+        {     dNaN,  dPosInf,     dNaN,     dNaN },
         {  dNegInf,     dNaN,     dNaN,     dNaN },
+        {     dNaN,  dNegInf,     dNaN,     dNaN }
     };
 
     private static void fTest(float[] row) {
@@ -109,7 +135,7 @@
             return;
         }
         if (min != row[2] || max != row[3]) {
-            throw new AssertionError("Unexpected result of double min/max" +
+            throw new AssertionError("Unexpected result of double min/max: " +
                     "a = " + row[0] + ", b = " + row[1] + ", " +
                     "result = (" + min + ", " + max + "), " +
                     "expected = (" + row[2] + ", " + row[3] + ")");
@@ -117,9 +143,10 @@
     }
 
     public static void main(String[] args) {
-        Arrays.stream(f_cases).forEach(TestFpMinMaxIntrinsics::fTest);
-        Arrays.stream(d_cases).forEach(TestFpMinMaxIntrinsics::dTest);
-        System.out.println("PASS");
+        for (int i = 0 ; i < 10_000 ; i++) {
+            Arrays.stream(f_cases).forEach(TestFpMinMaxIntrinsics::fTest);
+            Arrays.stream(d_cases).forEach(TestFpMinMaxIntrinsics::dTest);
+        }
     }
 }