This is an archive of the discontinued LLVM Phabricator instance.

Differential D69012

[Headers] Fix compatibility between arm_acle.h and intrin.h
ClosedPublic

Authored by efriedma on Oct 15 2019, 4:14 PM.

Details

Reviewers
rnk
chill
Commits
rG98286b569d01: [Headers] Fix compatibility between arm_acle.h and intrin.h
Summary

Make sure they don't both define __nop. We use a similar pattern for other functions in arm_acle.h.

Diff Detail

Event Timeline

efriedma created this revision.Oct 15 2019, 4:14 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 15 2019, 4:14 PM
Herald added a subscriber: kristof.beyls. · View Herald Transcript
chill accepted this revision.Oct 21 2019, 12:30 AM
This revision is now accepted and ready to land.Oct 21 2019, 12:30 AM
rnk accepted this revision.Oct 21 2019, 3:42 PM

lgtm

Closed by commit rG98286b569d01: [Headers] Fix compatibility between arm_acle.h and intrin.h (authored by efriedma). · Explain WhyOct 29 2019, 5:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Headers/
2 lines
test/
Headers/
6 lines

Diff 226999

clang/lib/Headers/arm_acle.h

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
#define __plix(cache_level, retention_policy, addr) \ #define __plix(cache_level, retention_policy, addr) \
__builtin_arm_prefetch(addr, 0, 0) __builtin_arm_prefetch(addr, 0, 0)
#else #else
#define __plix(cache_level, retention_policy, addr) \ #define __plix(cache_level, retention_policy, addr) \
__builtin_arm_prefetch(addr, 0, cache_level, retention_policy, 0) __builtin_arm_prefetch(addr, 0, cache_level, retention_policy, 0)
#endif #endif
/* 8.7 NOP */ /* 8.7 NOP */
#if !defined(_MSC_VER) || !defined(__aarch64__)
static __inline__ void __attribute__((__always_inline__, __nodebug__)) __nop(void) { static __inline__ void __attribute__((__always_inline__, __nodebug__)) __nop(void) {
__builtin_arm_nop(); __builtin_arm_nop();
} }
#endif
/* 9 DATA-PROCESSING INTRINSICS */ /* 9 DATA-PROCESSING INTRINSICS */
/* 9.2 Miscellaneous data-processing intrinsics */ /* 9.2 Miscellaneous data-processing intrinsics */
/* ROR */ /* ROR */
static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__)) static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
__ror(uint32_t __x, uint32_t __y) { __ror(uint32_t __x, uint32_t __y) {
__y %= 32; __y %= 32;
if (__y == 0) if (__y == 0)
▲ Show 20 Lines • Show All 573 Lines • Show Last 20 Lines

clang/test/Headers/arm-acle-header.c

// RUN: %clang_cc1 -triple armv7-eabi -target-cpu cortex-a15 -fsyntax-only -ffreestanding %s // RUN: %clang_cc1 -triple armv7-eabi -target-cpu cortex-a15 -fsyntax-only -ffreestanding %s
// RUN: %clang_cc1 -triple aarch64-eabi -target-cpu cortex-a53 -fsyntax-only -ffreestanding %s // RUN: %clang_cc1 -triple aarch64-eabi -target-cpu cortex-a53 -fsyntax-only -ffreestanding %s
// RUN: %clang_cc1 -triple thumbv7-windows -target-cpu cortex-a53 -fsyntax-only -ffreestanding %s // RUN: %clang_cc1 -triple thumbv7-windows -target-cpu cortex-a53 -fsyntax-only -ffreestanding %s
// RUN: %clang_cc1 -x c++ -triple armv7-eabi -target-cpu cortex-a15 -fsyntax-only -ffreestanding %s // RUN: %clang_cc1 -x c++ -triple armv7-eabi -target-cpu cortex-a15 -fsyntax-only -ffreestanding %s
// RUN: %clang_cc1 -x c++ -triple aarch64-eabi -target-cpu cortex-a57 -fsyntax-only -ffreestanding %s // RUN: %clang_cc1 -x c++ -triple aarch64-eabi -target-cpu cortex-a57 -fsyntax-only -ffreestanding %s
// RUN: %clang_cc1 -x c++ -triple thumbv7-windows -target-cpu cortex-a15 -fsyntax-only -ffreestanding %s // RUN: %clang_cc1 -x c++ -triple thumbv7-windows -target-cpu cortex-a15 -fsyntax-only -ffreestanding %s
// RUN: %clang_cc1 -x c++ -triple thumbv7-windows -target-cpu cortex-a15 -fsyntax-only -ffreestanding -fms-extensions -fms-compatibility -fms-compatibility-version=19.11 %s
// RUN: %clang_cc1 -x c++ -triple aarch64-windows -target-cpu cortex-a53 -fsyntax-only -ffreestanding -fms-extensions -fms-compatibility -fms-compatibility-version=19.11 %s
// expected-no-diagnostics // expected-no-diagnostics
#include <arm_acle.h> #include <arm_acle.h>
#ifdef _MSC_VER
#include <intrin.h>
#endif
void f() { __nop(); __dmb(0); __wfi(); }