Skip to content

Commit

Permalink
GDALNoDataMaskBand::IRasterIO(): speed optimization, and reduce copy&…
Browse files Browse the repository at this point in the history 
…paste
  • Loading branch information
@rouault
rouault committed May 14, 2024
1 parent 1687a31 commit 2838157
Showing 1 changed file with 106 additions and 74 deletions.
180 changes: 106 additions & 74 deletions gcore/gdalnodatamaskband.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,19 @@ static GDALDataType GetWorkDataType(GDALDataType eDataType)
eWrkDT = GDT_Byte;
break;

case GDT_Int16:
eWrkDT = GDT_Int16;
break;

case GDT_UInt16:
eWrkDT = GDT_UInt16;
break;

case GDT_UInt32:
eWrkDT = GDT_UInt32;
break;

case GDT_Int8:
case GDT_Int16:
case GDT_Int32:
case GDT_CInt16:
case GDT_CInt32:
Expand Down Expand Up @@ -162,6 +168,16 @@ bool GDALNoDataMaskBand::IsNoDataInRange(double dfNoDataValue,
return GDALIsValueInRange<GByte>(dfNoDataValue);
}

case GDT_Int16:
{
return GDALIsValueInRange<GInt16>(dfNoDataValue);
}

case GDT_UInt16:
{
return GDALIsValueInRange<GUInt16>(dfNoDataValue);
}

case GDT_UInt32:
{
return GDALIsValueInRange<GUInt32>(dfNoDataValue);
Expand Down Expand Up @@ -224,6 +240,62 @@ CPLErr GDALNoDataMaskBand::IReadBlock(int nXBlockOff, int nYBlockOff,
nBlockXSize, &sExtraArg);
}

/************************************************************************/
/* SetZeroOr255() */
/************************************************************************/

#if (defined(__GNUC__) && !defined(__clang__))
__attribute__((optimize("tree-vectorize")))
#endif
static void
SetZeroOr255(GByte *pabyDestAndSrc, size_t nBufSize, GByte byNoData)
{
for (size_t i = 0; i < nBufSize; ++i)
{
pabyDestAndSrc[i] = (pabyDestAndSrc[i] == byNoData) ? 0 : 255;
}
}

template <class T>
#if (defined(__GNUC__) && !defined(__clang__))
__attribute__((optimize("tree-vectorize")))
#endif
static void
SetZeroOr255(GByte *pabyDest, const T *panSrc, size_t nBufSize, T nNoData)
{
for (size_t i = 0; i < nBufSize; ++i)
{
pabyDest[i] = (panSrc[i] == nNoData) ? 0 : 255;
}
}

template <class T>
static void SetZeroOr255(GByte *pabyDest, const T *panSrc, int nBufXSize,
int nBufYSize, GSpacing nPixelSpace,
GSpacing nLineSpace, T nNoData)
{
if (nPixelSpace == static_cast<GSpacing>(sizeof(T)) &&
nLineSpace == nPixelSpace * nBufXSize)
{
const size_t nBufSize = static_cast<size_t>(nBufXSize) * nBufYSize;
SetZeroOr255(pabyDest, panSrc, nBufSize, nNoData);
}
else
{
size_t i = 0;
for (int iY = 0; iY < nBufYSize; iY++)
{
GByte *pabyLineDest = pabyDest + iY * nLineSpace;
for (int iX = 0; iX < nBufXSize; iX++)
{
*pabyLineDest = (panSrc[i] == nNoData) ? 0 : 255;
++i;
pabyLineDest += nPixelSpace;
}
}
}
}

/************************************************************************/
/* IRasterIO() */
/************************************************************************/
Expand Down Expand Up @@ -259,22 +331,12 @@ CPLErr GDALNoDataMaskBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
if (nPixelSpace == 1 && nLineSpace == nBufXSize)
{
const size_t nBufSize = static_cast<size_t>(nBufXSize) * nBufYSize;
for (size_t i = 0; i < nBufSize; ++i)
{
pabyData[i] = pabyData[i] == byNoData ? 0 : 255;
}
SetZeroOr255(pabyData, nBufSize, byNoData);
}
else
{
for (int iY = 0; iY < nBufYSize; iY++)
{
GByte *pabyLine = pabyData + iY * nLineSpace;
for (int iX = 0; iX < nBufXSize; iX++)
{
*pabyLine = *pabyLine == byNoData ? 0 : 255;
pabyLine += nPixelSpace;
}
}
SetZeroOr255(pabyData, pabyData, nBufXSize, nBufYSize, nPixelSpace,
nLineSpace, byNoData);
}
return CE_None;
}
Expand Down Expand Up @@ -311,41 +373,39 @@ CPLErr GDALNoDataMaskBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
*/
switch (eWrkDT)
{
case GDT_UInt32:
case GDT_Int16:
{
const GUInt32 nNoData = static_cast<GUInt32>(m_dfNoDataValue);
const GUInt32 *panSrc = static_cast<const GUInt32 *>(pTemp);
const auto nNoData = static_cast<int16_t>(m_dfNoDataValue);
const auto *panSrc = static_cast<const int16_t *>(pTemp);
SetZeroOr255(pabyDest, panSrc, nBufXSize, nBufYSize,
nPixelSpace, nLineSpace, nNoData);
}
break;

size_t i = 0;
for (int iY = 0; iY < nBufYSize; iY++)
{
GByte *pabyLineDest = pabyDest + iY * nLineSpace;
for (int iX = 0; iX < nBufXSize; iX++)
{
*pabyLineDest = panSrc[i] == nNoData ? 0 : 255;
++i;
pabyLineDest += nPixelSpace;
}
}
case GDT_UInt16:
{
const auto nNoData = static_cast<uint16_t>(m_dfNoDataValue);
const auto *panSrc = static_cast<const uint16_t *>(pTemp);
SetZeroOr255(pabyDest, panSrc, nBufXSize, nBufYSize,
nPixelSpace, nLineSpace, nNoData);
}
break;

case GDT_Int32:
case GDT_UInt32:
{
const GInt32 nNoData = static_cast<GInt32>(m_dfNoDataValue);
const GInt32 *panSrc = static_cast<const GInt32 *>(pTemp);
const auto nNoData = static_cast<GUInt32>(m_dfNoDataValue);
const auto *panSrc = static_cast<const GUInt32 *>(pTemp);
SetZeroOr255(pabyDest, panSrc, nBufXSize, nBufYSize,
nPixelSpace, nLineSpace, nNoData);
}
break;

size_t i = 0;
for (int iY = 0; iY < nBufYSize; iY++)
{
GByte *pabyLineDest = pabyDest + iY * nLineSpace;
for (int iX = 0; iX < nBufXSize; iX++)
{
*pabyLineDest = panSrc[i] == nNoData ? 0 : 255;
++i;
pabyLineDest += nPixelSpace;
}
}
case GDT_Int32:
{
const auto nNoData = static_cast<GInt32>(m_dfNoDataValue);
const auto *panSrc = static_cast<const GInt32 *>(pTemp);
SetZeroOr255(pabyDest, panSrc, nBufXSize, nBufYSize,
nPixelSpace, nLineSpace, nNoData);
}
break;

Expand Down Expand Up @@ -401,44 +461,16 @@ CPLErr GDALNoDataMaskBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
case GDT_Int64:
{
const auto *panSrc = static_cast<const int64_t *>(pTemp);

size_t i = 0;
for (int iY = 0; iY < nBufYSize; iY++)
{
GByte *pabyLineDest = pabyDest + iY * nLineSpace;
for (int iX = 0; iX < nBufXSize; iX++)
{
const auto nVal = panSrc[i];
if (nVal == m_nNoDataValueInt64)
*pabyLineDest = 0;
else
*pabyLineDest = 255;
++i;
pabyLineDest += nPixelSpace;
}
}
SetZeroOr255(pabyDest, panSrc, nBufXSize, nBufYSize,
nPixelSpace, nLineSpace, m_nNoDataValueInt64);
}
break;

case GDT_UInt64:
{
const auto *panSrc = static_cast<const uint64_t *>(pTemp);

size_t i = 0;
for (int iY = 0; iY < nBufYSize; iY++)
{
GByte *pabyLineDest = pabyDest + iY * nLineSpace;
for (int iX = 0; iX < nBufXSize; iX++)
{
const auto nVal = panSrc[i];
if (nVal == m_nNoDataValueUInt64)
*pabyLineDest = 0;
else
*pabyLineDest = 255;
++i;
pabyLineDest += nPixelSpace;
}
}
SetZeroOr255(pabyDest, panSrc, nBufXSize, nBufYSize,
nPixelSpace, nLineSpace, m_nNoDataValueUInt64);
}
break;

Expand Down

0 comments on commit 2838157

Please sign in to comment.