Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ARMv7 build for DwaCompressor, too. #1368

Merged
merged 1 commit into from
Mar 24, 2023
Merged

Fix ARMv7 build for DwaCompressor, too. #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/OpenEXR/ImfDwaCompressor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2789,7 +2789,7 @@ DwaCompressor::initializeFuncs ()
fromHalfZigZag = fromHalfZigZag_f16c;
}

#ifdef IMF_HAVE_NEON
#ifdef IMF_HAVE_NEON_AARCH64
{
convertFloatToHalf64 = convertFloatToHalf64_neon;
fromHalfZigZag = fromHalfZigZag_neon;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/OpenEXR/ImfDwaCompressorSimd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ convertFloatToHalf64_scalar (unsigned short* dst, float* src)
dst[i] = ((half) src[i]).bits ();
}

#ifdef IMF_HAVE_NEON
#ifdef IMF_HAVE_NEON_AARCH64

void
convertFloatToHalf64_neon (unsigned short* dst, float* src)
Expand Down Expand Up @@ -821,7 +821,7 @@ fromHalfZigZag_f16c (unsigned short* src, float* dst)
#endif /* defined IMF_HAVE_GCC_INLINEASM_X86_64 */
}

#ifdef IMF_HAVE_NEON
#ifdef IMF_HAVE_NEON_AARCH64


void
Expand Down Expand Up @@ -856,7 +856,7 @@ fromHalfZigZag_neon(unsigned short* __restrict__ src, float* __restrict__ dst)
}
}

#endif // IMF_HAVE_NEON
#endif // IMF_HAVE_NEON_AARCH64

//
// Inverse 8x8 DCT, only inverting the DC. This assumes that
Expand Down
8 changes: 4 additions & 4 deletions src/test/OpenEXRTest/testDwaCompressorSimd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ testFloatToHalf ()
}
}

#ifdef IMF_HAVE_NEON
#ifdef IMF_HAVE_NEON_AARCH64
{
cout << " convertFloatToHalf64_neon()" << endl;
for (int iter = 0; iter < numIter; ++iter)
Expand Down Expand Up @@ -437,7 +437,7 @@ testFloatToHalf ()
}
}
}
#endif // IMF_HAVE_NEON
#endif // IMF_HAVE_NEON_AARCH64
}

//
Expand Down Expand Up @@ -520,7 +520,7 @@ testFromHalfZigZag ()
} // iter
} // f16c

#ifdef IMF_HAVE_NEON
#ifdef IMF_HAVE_NEON_AARCH64
{
const int numIter = 1000000;
Rand48 rand48 (0);
Expand Down Expand Up @@ -557,7 +557,7 @@ testFromHalfZigZag ()
} // iter
} // neon

#endif // IMF_HAVE_NEON
#endif // IMF_HAVE_NEON_AARCH64
}

} // namespace
Expand Down