saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-19 21:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Work on eliminating Internal Compiler Error (#16741)

Browse source 
### Description
<!-- Describe your changes. -->
Replace the offending bitwise `operator |` with if() logic for ARM.
This commit is contained in:
Dmitri Smirnov 2023-07-18 10:17:52 -07:00 committed by GitHub
parent b71ebf91a5
commit e752cbe7f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/onnxruntime/core/session/onnxruntime_cxx_api.h
View file

@ -179,9 +179,9 @@ struct Float16_t : onnxruntime_float16::Float16Impl<Float16_t> {
Float16_t() = default;
/// <summary>
/// Explicit conversion to uint16_t representation of bfloat16.
/// Explicit conversion to uint16_t representation of float16.
/// </summary>
/// <param name="v">uint16_t bit representation of bfloat16</param>
/// <param name="v">uint16_t bit representation of float16</param>
/// <returns>new instance of Float16_t</returns>
constexpr static Float16_t FromBits(uint16_t v) noexcept { return Float16_t(v); }
@ -192,9 +192,9 @@ struct Float16_t : onnxruntime_float16::Float16Impl<Float16_t> {
explicit Float16_t(float v) noexcept { val = Base::ToUint16Impl(v); }
/// <summary>
/// Converts bfloat16 to float
/// Converts float16 to float
/// </summary>
/// <returns>float representation of bfloat16 value</returns>
/// <returns>float representation of float16 value</returns>
float ToFloat() const noexcept { return Base::ToFloatImpl(); }
/// <summary>

11
include/onnxruntime/core/session/onnxruntime_float16.h
View file

@ -310,7 +310,16 @@ inline float Float16Impl<Derived>::ToFloatImpl() const noexcept {
o.f -= magic.f; // re-normalize
}
o.u |= (val & 0x8000) << 16; // sign bit
// Attempt to workaround the Internal Compiler Error on ARM64
// for bitwise | operator, including std::bitset
#if (defined _MSC_VER) && (defined _M_ARM || defined _M_ARM64 || defined _M_ARM64EC)
if (IsNegative()) {
return -o.f;
}
#else
// original code:
o.u |= (val & 0x8000U) << 16U; // sign bit
#endif
return o.f;
}