Skip to content

remove inclusion of <intrin.h> from algorithm.h #569

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove inclusion of <intrin.h> from algorithm.h #569

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
4 changes: 0 additions & 4 deletions include/EASTL/algorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,6 @@

EA_DISABLE_ALL_VC_WARNINGS();

#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_X86_64))
#include <intrin.h>
#endif

#include <stddef.h>
#include <string.h> // memcpy, memcmp, memmove

Expand Down
21 changes: 16 additions & 5 deletions include/EASTL/bitset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,18 @@ EA_DISABLE_VC_WARNING(4127); // Conditional expression is constant
#pragma once // Some compilers (e.g. VC++) benefit significantly from using this. We've measured 3-4% build speed improvements in apps as a result.
#endif


#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86_64) || defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_ARM64))
extern "C" unsigned char _BitScanReverse(unsigned long *_Index, unsigned long _Mask);
extern "C" unsigned char _BitScanForward(unsigned long *_Index, unsigned long _Mask);
#pragma intrinsic(_BitScanReverse)
#pragma intrinsic(_BitScanForward)
#if defined(EA_PROCESSOR_X86_64) || defined(EA_PROCESSOR_ARM64)
extern "C" unsigned char _BitScanReverse64(unsigned long *_Index, unsigned __int64 _Mask);
extern "C" unsigned char _BitScanForward64(unsigned long *_Index, unsigned __int64 _Mask);
#pragma intrinsic(_BitScanReverse64)
#pragma intrinsic(_BitScanForward64)
#endif
#endif

namespace eastl
{
Expand Down Expand Up @@ -649,7 +660,7 @@ namespace eastl
template<typename UInt32>
eastl::enable_if_t<detail::is_word_type_v<UInt32> && sizeof(UInt32) == 4, uint32_t> GetFirstBit(UInt32 x)
{
#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_X86_64))
#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86_64) || defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_ARM64))
// This has been benchmarked as significantly faster than the generic code below.
unsigned char isNonZero;
unsigned long index;
Expand Down Expand Up @@ -679,7 +690,7 @@ namespace eastl
template<typename UInt64>
eastl::enable_if_t<detail::is_word_type_v<UInt64> && sizeof(UInt64) == 8, uint32_t> GetFirstBit(UInt64 x)
{
#if defined(EA_COMPILER_MSVC) && defined(EA_PROCESSOR_X86_64)
#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86_64) || defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_ARM64))
// This has been benchmarked as significantly faster than the generic code below.
unsigned char isNonZero;
unsigned long index;
Expand Down Expand Up @@ -767,7 +778,7 @@ namespace eastl
template<typename UInt32>
eastl::enable_if_t<detail::is_word_type_v<UInt32> && sizeof(UInt32) == 4, uint32_t> GetLastBit(UInt32 x)
{
#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_X86_64))
#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86_64) || defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_ARM64))
// This has been benchmarked as significantly faster than the generic code below.
unsigned char isNonZero;
unsigned long index;
Expand Down Expand Up @@ -798,7 +809,7 @@ namespace eastl
template<typename UInt64>
eastl::enable_if_t<detail::is_word_type_v<UInt64> && sizeof(UInt64) == 8, uint32_t> GetLastBit(UInt64 x)
{
#if defined(EA_COMPILER_MSVC) && defined(EA_PROCESSOR_X86_64)
#if defined(EA_COMPILER_MSVC) && (defined(EA_PROCESSOR_X86_64) || defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_ARM64))
// This has been benchmarked as significantly faster than the generic code below.
unsigned char isNonZero;
unsigned long index;
Expand Down
9 changes: 8 additions & 1 deletion include/EASTL/internal/fill_help.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@
#include <EASTL/internal/config.h>

#if defined(EA_COMPILER_MICROSOFT) && (defined(EA_PROCESSOR_X86) || defined(EA_PROCESSOR_X86_64))
#include <intrin.h>
extern "C" void __stosw(unsigned short *, unsigned short, size_t);
extern "C" void __stosd(unsigned long *, unsigned long, size_t);
#pragma intrinsic(__stosw)
#pragma intrinsic(__stosd)
#ifdef EA_PROCESSOR_X86_64
extern "C" void __stosq(unsigned __int64 *, unsigned __int64, size_t);
#pragma intrinsic(__stosq)
#endif
#endif

namespace eastl
Expand Down
Loading