Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Merge changes from TFS #14325

Merged
merged 2 commits into from
Oct 4, 2017
Merged

Merge changes from TFS #14325

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f87c34c
Fix for x86 JIT build break
briansull Oct 3, 2017
4422820
Allow X86 Hardware intrinsics for non-Legacy 32-bit x86
briansull Oct 4, 2017
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
Next Next commit
Fix for x86 JIT build break 
[tfs-changeset: 1677224]
  • Loading branch information
@briansull
briansull committed Oct 3, 2017
commit f87c34ccfc93a35407ce15468ee490779ff8e6c0
9 changes: 7 additions & 2 deletions src/jit/importer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3762,7 +3762,9 @@ GenTreePtr Compiler::impIntrinsic(GenTreePtr newobjThis,
{
assert(retNode == nullptr);
const NamedIntrinsic ni = lookupNamedIntrinsic(method);
#ifdef _TARGET_XARCH_
#ifdef _TARGET_AMD64_
// impX86HWIntrinsic :: Only supported for 64-bit
//
if (ni > NI_HW_INTRINSIC_START && ni < NI_HW_INTRINSIC_END)
{
retNode = impX86HWIntrinsic(ni, method, sig);
Expand Down Expand Up @@ -3990,13 +3992,16 @@ NamedIntrinsic Compiler::lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method)
}
}

#ifdef _TARGET_XARCH_
#ifdef _TARGET_AMD64_
// lookupHWIntrinsicISA :: Only supported for 64-bit
//
if ((namespaceName != nullptr) && strcmp(namespaceName, "System.Runtime.Intrinsics.X86") == 0)
{
InstructionSet isa = lookupHWIntrinsicISA(className);
result = lookupHWIntrinsic(methodName, isa);
}
#endif

return result;
}

Expand Down