[svn-r14442] Modified metadata cache to adapt more quickly to the insertion of a

large entry, or to a large increases in the size of an existing entry.
This required some additions to the cache configuration structure, and
thus will require changes in the metadata cache documentation.

The basic idea is to monitor the size of entries as they are loaded,
inserted, or increased in size.  If the size of the entry (or increase)
exceeds some user selected fraction of the size of the cache, increase
the size of the cache.

Note that this fix was designed quickly -- while it deals with the 
use case that exposed the problem, we may have to revisit the issue
later.

Tested serial and parallel on Phoenix, and h5committest.

1 files changed, 371 insertions, 18 deletions

diff --git a/test/cache_api.c b/test/cache_api.c
index a1da62f..6a75d11 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -50,6 +50,9 @@ const char *FILENAME[] = {
   ( (a).increment              == (b).increment ) &&              \
   ( (a).apply_max_increment    == (b).apply_max_increment ) &&    \
   ( (a).max_increment          == (b).max_increment ) &&          \
+  ( (a).flash_incr_mode        == (b).flash_incr_mode ) &&        \
+  ( (a).flash_multiple         == (b).flash_multiple ) &&         \
+  ( (a).flash_threshold        == (b).flash_threshold ) &&        \
   ( (a).decr_mode              == (b).decr_mode ) &&              \
   ( (a).upper_hr_threshold     == (b).upper_hr_threshold ) &&     \
   ( (a).decrement              == (b).decrement ) &&              \
@@ -139,6 +142,9 @@ static void check_file_mdc_api_errs(void);
     ( (a).increment              == (b).increment ) &&               \
     ( (a).apply_max_increment    == (b).apply_max_increment ) &&     \
     ( (a).max_increment          == (b).max_increment ) &&           \
+    ( (a).flash_incr_mode        == (b).flash_incr_mode ) &&         \
+    ( (a).flash_multiple         == (b).flash_multiple ) &&          \
+    ( (a).flash_threshold        == (b).flash_threshold ) &&         \
     ( (a).decr_mode              == (b).decr_mode ) &&               \
     ( (a).upper_hr_threshold     == (b).upper_hr_threshold ) &&      \
     ( (a).decrement              == (b).decrement ) &&               \
@@ -166,8 +172,14 @@ static void check_file_mdc_api_errs(void);
     (i).increment              = (e).increment;                     \
     (i).apply_max_increment    = (e).apply_max_increment;           \
     (i).max_increment          = (e).max_increment;                 \
+    (i).flash_incr_mode        = (e).flash_incr_mode;               \
+    (i).flash_multiple         = (e).flash_multiple;                \
+    (i).flash_threshold        = (e).flash_threshold;               \
     (i).decr_mode              = (e).decr_mode;                     \
     (i).upper_hr_threshold     = (e).upper_hr_threshold;            \
+    (i).flash_incr_mode        = (e).flash_incr_mode;               \
+    (i).flash_multiple         = (e).flash_multiple;                \
+    (i).flash_threshold        = (e).flash_threshold;               \
     (i).decrement              = (e).decrement;                     \
     (i).apply_max_decrement    = (e).apply_max_decrement;           \
     (i).max_decrement          = (e).max_decrement;                 \
@@ -208,6 +220,10 @@ check_fapl_mdc_api_calls(void)
       /* double      increment              = */ 2.1,
       /* hbool_t     apply_max_increment    = */ TRUE,
       /* size_t      max_increment          = */ (4 * 1024 * 1024 + 1),
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 2.0,
+      /* double      flash_threshold        = */ 0.5,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
       /* double      upper_hr_threshold     = */ 0.998,
       /* double      decrement              = */ 0.91,
@@ -695,7 +711,7 @@ validate_mdc_config(hid_t file_id,
         /* Recall that in any configuration supplied by the cache
          * at run time, the set_initial_size field will always
          * be FALSE, regardless of the value passed in.  Thus we
-         * always resume that this field need not match that of
+         * always presume that this field need not match that of
          * the supplied external configuration.
          *
          * The cache also sets the initial_size field to the current
@@ -773,6 +789,10 @@ check_file_mdc_api_calls(void)
       /* double      increment              = */ 2.1,
       /* hbool_t     apply_max_increment    = */ TRUE,
       /* size_t      max_increment          = */ (4 * 1024 * 1024 + 1),
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 2.0,
+      /* double      flash_threshold        = */ 0.5,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
       /* double      upper_hr_threshold     = */ 0.998,
       /* double      decrement              = */ 0.91,
@@ -802,6 +822,10 @@ check_file_mdc_api_calls(void)
       /* double      increment              = */ 2.0,
       /* hbool_t     apply_max_increment    = */ TRUE,
       /* size_t      max_increment          = */ (2 * 1024 * 1024),
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 1.5,
+      /* double      flash_threshold        = */ 0.4,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
       /* double      upper_hr_threshold     = */ 0.9995,
       /* double      decrement              = */ 0.95,
@@ -831,6 +855,10 @@ check_file_mdc_api_calls(void)
       /* double      increment              = */ 2.0,
       /* hbool_t     apply_max_increment    = */ TRUE,
       /* size_t      max_increment          = */ (4 * 1024 * 1024),
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 2.1,
+      /* double      flash_threshold        = */ 0.6,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
       /* double      upper_hr_threshold     = */ 0.999,
       /* double      decrement              = */ 0.9,
@@ -860,6 +888,10 @@ check_file_mdc_api_calls(void)
       /* double      increment              = */ 2.0,
       /* hbool_t     apply_max_increment    = */ TRUE,
       /* size_t      max_increment          = */ (2 * 1024 * 1024),
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 1.1,
+      /* double      flash_threshold        = */ 0.3,
       /* enum H5C_cache_decr_mode decr_mode = */
                                                H5C_decr__age_out_with_threshold,
       /* double      upper_hr_threshold     = */ 0.999,
@@ -1389,6 +1421,10 @@ mdc_api_call_smoke_check(void)
       /* double      increment              = */ 2.0,
       /* hbool_t     apply_max_increment    = */ FALSE,
       /* size_t      max_increment          = */ 4000000,
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 2.0,
+      /* double      flash_threshold        = */ 0.5,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
       /* double      upper_hr_threshold     = */ 0.999,
       /* double      decrement              = */ 0.9,
@@ -1418,6 +1454,10 @@ mdc_api_call_smoke_check(void)
       /* double      increment              = */ 2.0,
       /* hbool_t     apply_max_increment    = */ FALSE,
       /* size_t      max_increment          = */ 4000000,
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 2.0,
+      /* double      flash_threshold        = */ 0.5,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
       /* double      upper_hr_threshold     = */ 0.999,
       /* double      decrement              = */ 0.9,
@@ -1447,6 +1487,10 @@ mdc_api_call_smoke_check(void)
       /* double      increment              = */ 2.0,
       /* hbool_t     apply_max_increment    = */ FALSE,
       /* size_t      max_increment          = */ 4000000,
+      /* enum H5C_cache_flash_incr_mode       */
+      /*                    flash_incr_mode = */ H5C_flash_incr__off,
+      /* double      flash_multiple         = */ 2.0,
+      /* double      flash_threshold        = */ 0.5,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
       /* double      upper_hr_threshold     = */ 0.999,
       /* double      decrement              = */ 0.9,
@@ -2092,7 +2136,7 @@ mdc_api_call_smoke_check(void)
  * used to test error rejection in the MDC related API calls.
  */
 
-#define NUM_INVALID_CONFIGS	36
+#define NUM_INVALID_CONFIGS	41
 
 H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
 {
@@ -2115,6 +2159,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2143,6 +2191,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      lower_hr_threshold     = */ 0.9,
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
@@ -2173,6 +2225,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2202,6 +2258,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2231,6 +2291,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2260,6 +2324,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2289,6 +2357,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2318,6 +2390,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2347,6 +2423,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2376,6 +2456,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2405,6 +2489,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2434,6 +2522,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2463,6 +2555,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2492,6 +2588,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2521,6 +2621,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2550,6 +2654,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2579,6 +2687,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2608,6 +2720,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2637,6 +2753,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 0.999999999999,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2666,6 +2786,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ (hbool_t)-1,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2677,7 +2801,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 20 -- bad decr_mode */
+    /* 20 -- invalid flash_incr_mode */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2695,6 +2819,175 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ -1,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
+    /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+    /* double      upper_hr_threshold     = */ 0.999,
+    /* double      decrement              = */ 0.9,
+    /* hbool_t     apply_max_decrement    = */ TRUE,
+    /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+    /* int         epochs_before_eviction = */ 3,
+    /* hbool_t     apply_empty_reserve    = */ TRUE,
+    /* double      empty_reserve          = */ 0.1,
+    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+  },
+  {
+    /* 21 -- flash_multiple too small */
+    /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+    /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+    /* hbool_t     open_trace_file        = */ FALSE,
+    /* hbool_t     close_trace_file       = */ FALSE,
+    /* char        trace_file_name[]      = */ "",
+    /* hbool_t     evictions_enabled      = */ TRUE,
+    /* hbool_t     set_initial_size       = */ TRUE,
+    /* size_t      initial_size           = */ (1 * 1024 * 1024),
+    /* double      min_clean_fraction     = */ 0.25,
+    /* size_t      max_size               = */ (16 * 1024 * 1024),
+    /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+    /* long int    epoch_length           = */ 50000,
+    /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+    /* double      lower_hr_threshold     = */ 0.9,
+    /* double      increment              = */ 2.0,
+    /* hbool_t     apply_max_increment    = */ TRUE,
+    /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__add_space,
+    /* double      flash_multiple         = */ 0.09,
+    /* double      flash_threshold        = */ 0.5,
+    /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+    /* double      upper_hr_threshold     = */ 0.999,
+    /* double      decrement              = */ 0.9,
+    /* hbool_t     apply_max_decrement    = */ TRUE,
+    /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+    /* int         epochs_before_eviction = */ 3,
+    /* hbool_t     apply_empty_reserve    = */ TRUE,
+    /* double      empty_reserve          = */ 0.1,
+    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+  },
+  {
+    /* 22 -- flash_multiple too big */
+    /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+    /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+    /* hbool_t     open_trace_file        = */ FALSE,
+    /* hbool_t     close_trace_file       = */ FALSE,
+    /* char        trace_file_name[]      = */ "",
+    /* hbool_t     evictions_enabled      = */ TRUE,
+    /* hbool_t     set_initial_size       = */ TRUE,
+    /* size_t      initial_size           = */ (1 * 1024 * 1024),
+    /* double      min_clean_fraction     = */ 0.25,
+    /* size_t      max_size               = */ (16 * 1024 * 1024),
+    /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+    /* long int    epoch_length           = */ 50000,
+    /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+    /* double      lower_hr_threshold     = */ 0.9,
+    /* double      increment              = */ 2.0,
+    /* hbool_t     apply_max_increment    = */ TRUE,
+    /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__add_space,
+    /* double      flash_multiple         = */ 10.001,
+    /* double      flash_threshold        = */ 0.5,
+    /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+    /* double      upper_hr_threshold     = */ 0.999,
+    /* double      decrement              = */ 0.9,
+    /* hbool_t     apply_max_decrement    = */ TRUE,
+    /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+    /* int         epochs_before_eviction = */ 3,
+    /* hbool_t     apply_empty_reserve    = */ TRUE,
+    /* double      empty_reserve          = */ 0.1,
+    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+  },
+  {
+    /* 23 -- flash_threshold too small */
+    /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+    /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+    /* hbool_t     open_trace_file        = */ FALSE,
+    /* hbool_t     close_trace_file       = */ FALSE,
+    /* char        trace_file_name[]      = */ "",
+    /* hbool_t     evictions_enabled      = */ TRUE,
+    /* hbool_t     set_initial_size       = */ TRUE,
+    /* size_t      initial_size           = */ (1 * 1024 * 1024),
+    /* double      min_clean_fraction     = */ 0.25,
+    /* size_t      max_size               = */ (16 * 1024 * 1024),
+    /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+    /* long int    epoch_length           = */ 50000,
+    /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+    /* double      lower_hr_threshold     = */ 0.9,
+    /* double      increment              = */ 2.0,
+    /* hbool_t     apply_max_increment    = */ TRUE,
+    /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__add_space,
+    /* double      flash_multiple         = */ 1.0,
+    /* double      flash_threshold        = */ 0.099,
+    /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+    /* double      upper_hr_threshold     = */ 0.999,
+    /* double      decrement              = */ 0.9,
+    /* hbool_t     apply_max_decrement    = */ TRUE,
+    /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+    /* int         epochs_before_eviction = */ 3,
+    /* hbool_t     apply_empty_reserve    = */ TRUE,
+    /* double      empty_reserve          = */ 0.1,
+    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+  },
+  {
+    /* 24 -- flash_threshold too big */
+    /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+    /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+    /* hbool_t     open_trace_file        = */ FALSE,
+    /* hbool_t     close_trace_file       = */ FALSE,
+    /* char        trace_file_name[]      = */ "",
+    /* hbool_t     evictions_enabled      = */ TRUE,
+    /* hbool_t     set_initial_size       = */ TRUE,
+    /* size_t      initial_size           = */ (1 * 1024 * 1024),
+    /* double      min_clean_fraction     = */ 0.25,
+    /* size_t      max_size               = */ (16 * 1024 * 1024),
+    /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+    /* long int    epoch_length           = */ 50000,
+    /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+    /* double      lower_hr_threshold     = */ 0.9,
+    /* double      increment              = */ 2.0,
+    /* hbool_t     apply_max_increment    = */ TRUE,
+    /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__add_space,
+    /* double      flash_multiple         = */ 1.0,
+    /* double      flash_threshold        = */ 1.001,
+    /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+    /* double      upper_hr_threshold     = */ 0.999,
+    /* double      decrement              = */ 0.9,
+    /* hbool_t     apply_max_decrement    = */ TRUE,
+    /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+    /* int         epochs_before_eviction = */ 3,
+    /* hbool_t     apply_empty_reserve    = */ TRUE,
+    /* double      empty_reserve          = */ 0.1,
+    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+  },
+  {
+    /* 25 -- bad decr_mode */
+    /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+    /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+    /* hbool_t     open_trace_file        = */ FALSE,
+    /* hbool_t     close_trace_file       = */ FALSE,
+    /* char        trace_file_name[]      = */ "",
+    /* hbool_t     evictions_enabled      = */ TRUE,
+    /* hbool_t     set_initial_size       = */ TRUE,
+    /* size_t      initial_size           = */ (1 * 1024 * 1024),
+    /* double      min_clean_fraction     = */ 0.25,
+    /* size_t      max_size               = */ (16 * 1024 * 1024),
+    /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+    /* long int    epoch_length           = */ 50000,
+    /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+    /* double      lower_hr_threshold     = */ 0.9,
+    /* double      increment              = */ 2.0,
+    /* hbool_t     apply_max_increment    = */ TRUE,
+    /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ -1,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2706,7 +2999,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 21 -- upper_hr_threshold too big */
+    /* 26 -- upper_hr_threshold too big */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2724,6 +3017,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
     /* double      upper_hr_threshold     = */ 1.00001,
     /* double      decrement              = */ 0.9,
@@ -2735,7 +3032,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 22 -- decrement too small */
+    /* 27 -- decrement too small */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2753,6 +3050,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ -0.0000000001,
@@ -2764,7 +3065,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 23 -- decrement too big */
+    /* 28 -- decrement too big */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2782,6 +3083,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 1.0000000001,
@@ -2793,7 +3098,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 24 -- epochs_before_eviction too small */
+    /* 29 -- epochs_before_eviction too small */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2811,6 +3116,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2822,7 +3131,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 24 -- epochs_before_eviction too big */
+    /* 30 -- epochs_before_eviction too big */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2840,6 +3149,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2851,7 +3164,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 26 -- invalid apply_empty_reserve */
+    /* 31 -- invalid apply_empty_reserve */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2869,6 +3182,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2880,7 +3197,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 27 -- empty_reserve too small */
+    /* 32 -- empty_reserve too small */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2898,6 +3215,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2909,7 +3230,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 28 -- empty_reserve too big */
+    /* 33 -- empty_reserve too big */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2927,6 +3248,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -2938,7 +3263,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 29 -- upper_hr_threshold too small */
+    /* 34 -- upper_hr_threshold too small */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2956,6 +3281,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ -0.000000001,
     /* double      decrement              = */ 0.9,
@@ -2967,7 +3296,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 30 -- upper_hr_threshold too big */
+    /* 35 -- upper_hr_threshold too big */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -2985,6 +3314,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 1.00000001,
     /* double      decrement              = */ 0.9,
@@ -2996,7 +3329,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 31 -- upper_hr_threshold <= lower_hr_threshold */
+    /* 36 -- upper_hr_threshold <= lower_hr_threshold */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -3014,6 +3347,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.9,
     /* double      decrement              = */ 0.9,
@@ -3025,7 +3362,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 32 -- dirty_bytes_threshold too small */
+    /* 37 -- dirty_bytes_threshold too small */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -3043,6 +3380,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.999,
     /* double      decrement              = */ 0.9,
@@ -3054,7 +3395,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (H5C__MIN_MAX_CACHE_SIZE / 2) - 1
   },
   {
-    /* 33 -- dirty_bytes_threshold too big */
+    /* 38 -- dirty_bytes_threshold too big */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -3072,6 +3413,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 0.9,
     /* double      decrement              = */ 0.9,
@@ -3083,7 +3428,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (H5C__MAX_MAX_CACHE_SIZE / 4) + 1
   },
   {
-    /* 34 -- attempt to disable evictions when auto incr enabled */
+    /* 39 -- attempt to disable evictions when auto incr enabled */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -3101,6 +3446,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
     /* double      upper_hr_threshold     = */ 0.9,
     /* double      decrement              = */ 0.9,
@@ -3112,7 +3461,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         dirty_bytes_threshold  = */ (256 * 1024)
   },
   {
-    /* 35 -- attempt to disable evictions when auto decr enabled */
+    /* 40 -- attempt to disable evictions when auto decr enabled */
     /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
     /* hbool_t     rpt_fcn_enabled        = */ FALSE,
     /* hbool_t     open_trace_file        = */ FALSE,
@@ -3130,6 +3479,10 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* double      increment              = */ 2.0,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
     /* double      upper_hr_threshold     = */ 0.9,
     /* double      decrement              = */ 0.9,