Skip to content

Mark libc math shims with always_inline attribute #6956

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

Merged
merged 2 commits into from
Jan 20, 2017
Merged

Mark libc math shims with always_inline attribute #6956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3261db
Mark libc math shims with always_inline attribute
stephentyrone Jan 20, 2017
85ec46e
Revert to XFAILing Linux.
stephentyrone Jan 20, 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
20 changes: 13 additions & 7 deletions stdlib/public/SwiftShims/LibcShims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,30 +91,36 @@ __swift_uint32_t
_swift_stdlib_cxx11_mt19937_uniform(__swift_uint32_t upper_bound);

// Math library functions
static inline float _swift_stdlib_remainderf(float _self, float _other) {
static inline __attribute__((always_inline))
float _swift_stdlib_remainderf(float _self, float _other) {
return __builtin_remainderf(_self, _other);
}

static inline float _swift_stdlib_squareRootf(float _self) {
return __builtin_sqrtf(_self);
static inline __attribute__((always_inline))
float _swift_stdlib_squareRootf(float _self) {
return __builtin_sqrt(_self);
}

static inline double _swift_stdlib_remainder(double _self, double _other) {
static inline __attribute__((always_inline))
double _swift_stdlib_remainder(double _self, double _other) {
return __builtin_remainder(_self, _other);
}

static inline double _swift_stdlib_squareRoot(double _self) {
static inline __attribute__((always_inline))
double _swift_stdlib_squareRoot(double _self) {
return __builtin_sqrt(_self);
}

// TODO: Remove horrible workaround when importer does Float80 <-> long double.
#if (defined __i386__ || defined __x86_64__) && !defined _MSC_VER
static inline void _swift_stdlib_remainderl(void *_self, const void *_other) {
static inline __attribute__((always_inline))
void _swift_stdlib_remainderl(void *_self, const void *_other) {
long double *_f80self = (long double *)_self;
*_f80self = __builtin_remainderl(*_f80self, *(const long double *)_other);
}

static inline void _swift_stdlib_squareRootl(void *_self) {
static inline __attribute__((always_inline))
void _swift_stdlib_squareRootl(void *_self) {
long double *_f80self = (long double *)_self;
*_f80self = __builtin_sqrtl(*_f80self);
}
Expand Down
15 changes: 14 additions & 1 deletion test/IRGen/builtin_math.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-ir -O %s | %FileCheck %s

// REQUIRES: 30043258
// XFAIL: linux

import Darwin
Expand Down Expand Up @@ -39,6 +38,20 @@ public func test4(f : Float) -> Float {
return sqrt(f)
}

// CHECK-LABEL: define {{.*}}test3a
// CHECK: call double @remainder

public func test3a(d : Double) -> Double {
return remainder(1,d)
}

// CHECK-LABEL: define {{.*}}test4a
// CHECK: call float @remainder

public func test4a(f : Float) -> Float {
return remainder(1,f)
}

// CHECK-LABEL: define {{.*}}test5
// CHECK: ret float 2

Expand Down