Skip to content

Commit

Permalink
Fix possible performance regression introduced with in-place type con…
Browse files Browse the repository at this point in the history
…version in 1.14.2 (#3376)
  • Loading branch information
fortnern authored Aug 15, 2023
1 parent ba2193a commit e5e8691
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions src/H5Dscatgath.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,16 @@ H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_dset_io_info_t *dset_
in_place_tconv = dset_info->layout_io_info.contig_piece_info &&
dset_info->layout_io_info.contig_piece_info->in_place_tconv;

/* Check if we should disable in-place type conversion for performance. Do so if we can use the optimized
* compound read function, if this is not a selection I/O operation (so we have normal size conversion
* buffers), and the either entire I/O operation can fit in the type conversion buffer or we need to use a
* background buffer (and therefore could not do the I/O in one operation with in-place conversion
* anyways). */
if (in_place_tconv && H5D__SCATGATH_USE_CMPD_OPT_READ(dset_info, FALSE) &&
(io_info->use_select_io != H5D_SELECTION_IO_MODE_ON) &&
(dset_info->type_info.need_bkg || (dset_info->nelmts <= dset_info->type_info.request_nelmts)))
in_place_tconv = FALSE;

/* Allocate the iterators */
if (NULL == (mem_iter = H5FL_MALLOC(H5S_sel_iter_t)))
HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "can't allocate memory iterator");
Expand Down Expand Up @@ -653,6 +663,16 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_dset_io_info_t *dset
in_place_tconv = dset_info->layout_io_info.contig_piece_info &&
dset_info->layout_io_info.contig_piece_info->in_place_tconv;

/* Check if we should disable in-place type conversion for performance. Do so if we can use the optimized
* compound write function, if this is not a selection I/O operation (so we have normal size conversion
* buffers), and the either entire I/O operation can fit in the type conversion buffer or we need to use a
* background buffer (and therefore could not do the I/O in one operation with in-place conversion
* anyways). */
if (in_place_tconv && H5D__SCATGATH_USE_CMPD_OPT_WRITE(dset_info, FALSE) &&
(io_info->use_select_io != H5D_SELECTION_IO_MODE_ON) &&
(dset_info->type_info.need_bkg || (dset_info->nelmts <= dset_info->type_info.request_nelmts)))
in_place_tconv = FALSE;

/* Allocate the iterators */
if (NULL == (mem_iter = H5FL_MALLOC(H5S_sel_iter_t)))
HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "can't allocate memory iterator");
Expand Down

0 comments on commit e5e8691

Please sign in to comment.