Skip to content

[libc] Added type-generic macros for fixed-point functions #129371

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 6 commits into from
Mar 9, 2025
Merged

[libc] Added type-generic macros for fixed-point functions #129371

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc55d8c
added type-generic macros for abs, countls and round
lazyprop Mar 1, 2025
e53d151
the macros should not invoke cpp namespace
lazyprop Mar 5, 2025
1e6be62
clang-format stdfix-macros.h
lazyprop Mar 6, 2025
8d35583
use accum instead of _Accum
lazyprop Mar 6, 2025
0c30e06
run git-clang-format on the entire branch
lazyprop Mar 6, 2025
0c03b23
Merge branch 'main' into fixpoint-macros
lazyprop Mar 8, 2025
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
40 changes: 40 additions & 0 deletions libc/include/llvm-libc-macros/stdfix-macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,46 @@
#define ULACCUM_EPSILON 0x1.0p-32ULK
#endif // ULACCUM_EPSILON

#define absfx(x) _Generic((x), \
fract: LIBC_NAMESPACE::absr, \
short fract: LIBC_NAMESPACE::abshr, \
long fract: LIBC_NAMESPACE::abslr, \
_Accum: LIBC_NAMESPACE::absk, \
short _Accum: LIBC_NAMESPACE::abshk, \
long _Accum: LIBC_NAMESPACE::abslk \
)(x)

#define countlsfx(x) _Generic((x), \
fract: LIBC_NAMESPACE::countlsr, \
short fract: LIBC_NAMESPACE::countlshr, \
long fract: LIBC_NAMESPACE::countlslr, \
_Accum: LIBC_NAMESPACE::countlsk, \
short _Accum: LIBC_NAMESPACE::countlshk, \
long _Accum: LIBC_NAMESPACE::countlslk, \
unsigned fract: LIBC_NAMESPACE::countlsur, \
unsigned short fract: LIBC_NAMESPACE::countlsuhr, \
unsigned long fract: LIBC_NAMESPACE::countlsulr, \
unsigned _Accum: LIBC_NAMESPACE::countlsuk, \
unsigned short _Accum: LIBC_NAMESPACE::countlsuhk, \
unsigned long _Accum: LIBC_NAMESPACE::countlsulk \
)(x)

#define roundfx(x, y) _Generic((x), \
fract: LIBC_NAMESPACE::roundr, \
short fract: LIBC_NAMESPACE::roundhr, \
long fract: LIBC_NAMESPACE::roundlr, \
_Accum: LIBC_NAMESPACE::roundk, \
short _Accum: LIBC_NAMESPACE::roundhk, \
long _Accum: LIBC_NAMESPACE::roundlk, \
unsigned fract: LIBC_NAMESPACE::roundur, \
unsigned short fract: LIBC_NAMESPACE::rounduhr, \
unsigned long fract: LIBC_NAMESPACE::roundulr, \
unsigned _Accum: LIBC_NAMESPACE::rounduk, \
unsigned short _Accum: LIBC_NAMESPACE::rounduhk, \
unsigned long _Accum: LIBC_NAMESPACE::roundulk \
)(x, y)


#endif // LIBC_COMPILER_HAS_FIXED_POINT

#endif // LLVM_LIBC_MACROS_STDFIX_MACROS_H
8 changes: 7 additions & 1 deletion libc/include/stdfix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
header: stdfix.h
header_template: stdfix.h.def
macros: []
macros:
- macro_name: absfx
macro_header: stdfix-macros.h
- macro_name: countlsfx
macro_header: stdfix-macros.h
- macro_name: roundfx
macro_header: stdfix-macros.h
types:
- type_name: stdfix-types
enums: []
Expand Down
23 changes: 23 additions & 0 deletions libc/test/src/stdfix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ endif()

add_custom_target(libc-stdfix-tests)


foreach(suffix IN ITEMS hr r lr hk k lk)
add_libc_test(
abs${suffix}_test
Expand Down Expand Up @@ -176,3 +177,25 @@ add_libc_test(
libc.src.__support.fixed_point.fx_rep
libc.src.__support.FPUtil.basic_operations
)

set(macros_depends)

foreach(s IN ITEMS r hr lr k hk lk)
list(APPEND macros_depends
libc.src.stdfix.abs${s}
libc.src.stdfix.countls${s}
libc.src.stdfix.countlsu${s}
libc.src.stdfix.round${s}
libc.src.stdfix.roundu${s}
)
endforeach()

add_libc_test(
macros_test
SUITE libc-stdfix-tests
SRCS macros_test.cpp
DEPENDS
libc.include.stdfix
${macros_depends}
)

84 changes: 84 additions & 0 deletions libc/test/src/stdfix/macros_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
//===-- Unittests for absfx -----------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include "AbsTest.h"
#include "src/stdfix/absr.h"
#include "src/stdfix/abshr.h"
#include "src/stdfix/abslr.h"
#include "src/stdfix/absk.h"
#include "src/stdfix/abshk.h"
#include "src/stdfix/abslk.h"

#include "src/stdfix/countlsr.h"
#include "src/stdfix/countlshr.h"
#include "src/stdfix/countlslr.h"
#include "src/stdfix/countlsk.h"
#include "src/stdfix/countlshk.h"
#include "src/stdfix/countlslk.h"
#include "src/stdfix/countlsur.h"
#include "src/stdfix/countlsuhr.h"
#include "src/stdfix/countlsulr.h"
#include "src/stdfix/countlsuk.h"
#include "src/stdfix/countlsuhk.h"
#include "src/stdfix/countlsulk.h"

#include "src/stdfix/roundr.h"
#include "src/stdfix/roundhr.h"
#include "src/stdfix/roundlr.h"
#include "src/stdfix/roundk.h"
#include "src/stdfix/roundhk.h"
#include "src/stdfix/roundlk.h"
#include "src/stdfix/roundur.h"
#include "src/stdfix/rounduhr.h"
#include "src/stdfix/roundulr.h"
#include "src/stdfix/rounduk.h"
#include "src/stdfix/rounduhk.h"
#include "src/stdfix/roundulk.h"

TEST(LlvmLibcAbsfxTest, Basic) {
ASSERT_EQ(absfx(-0.5r), LIBC_NAMESPACE::absr(-0.5r));
ASSERT_EQ(absfx(-0.5hr), LIBC_NAMESPACE::abshr(-0.5hr));
ASSERT_EQ(absfx(-0.5lr), LIBC_NAMESPACE::abslr(-0.5lr));
ASSERT_EQ(absfx(-0.5k), LIBC_NAMESPACE::absk(-0.5k));
ASSERT_EQ(absfx(-0.5hk), LIBC_NAMESPACE::abshk(-0.5hk));
ASSERT_EQ(absfx(-0.5lk), LIBC_NAMESPACE::abslk(-0.5lk));
}

TEST(LlvmLibcRoundfxTest, Basic) {
ASSERT_EQ(roundfx(0.75r, 0), LIBC_NAMESPACE::roundr(0.75r, 0));
ASSERT_EQ(roundfx(0.75hr, 0), LIBC_NAMESPACE::roundhr(0.75hr, 0));
ASSERT_EQ(roundfx(0.75lr, 0), LIBC_NAMESPACE::roundlr(0.75lr, 0));
ASSERT_EQ(roundfx(0.75k, 0), LIBC_NAMESPACE::roundk(0.75k, 0));
ASSERT_EQ(roundfx(0.75hk, 0), LIBC_NAMESPACE::roundhk(0.75hk, 0));
ASSERT_EQ(roundfx(0.75lk, 0), LIBC_NAMESPACE::roundlk(0.75lk, 0));

ASSERT_EQ(roundfx(0.75ur, 0), LIBC_NAMESPACE::roundur(0.75ur, 0));
ASSERT_EQ(roundfx(0.75uhr, 0), LIBC_NAMESPACE::rounduhr(0.75uhr, 0));
ASSERT_EQ(roundfx(0.75ulr, 0), LIBC_NAMESPACE::roundulr(0.75ulr, 0));
ASSERT_EQ(roundfx(0.75uk, 0), LIBC_NAMESPACE::rounduk(0.75uk, 0));
ASSERT_EQ(roundfx(0.75uhk, 0), LIBC_NAMESPACE::rounduhk(0.75uhk, 0));
ASSERT_EQ(roundfx(0.75ulk, 0), LIBC_NAMESPACE::roundulk(0.75ulk, 0));
}


TEST(LlvmLibcCountlsfxTest, Basic) {
ASSERT_EQ(countlsfx(0.5r), LIBC_NAMESPACE::countlsr(0.5r));
ASSERT_EQ(countlsfx(0.5hr), LIBC_NAMESPACE::countlshr(0.5hr));
ASSERT_EQ(countlsfx(0.5lr), LIBC_NAMESPACE::countlslr(0.5lr));
ASSERT_EQ(countlsfx(0.5k), LIBC_NAMESPACE::countlsk(0.5k));
ASSERT_EQ(countlsfx(0.5hk), LIBC_NAMESPACE::countlshk(0.5hk));
ASSERT_EQ(countlsfx(0.5lk), LIBC_NAMESPACE::countlslk(0.5lk));

ASSERT_EQ(countlsfx(0.5ur), LIBC_NAMESPACE::countlsr(0.5ur));
ASSERT_EQ(countlsfx(0.5uhr), LIBC_NAMESPACE::countlshr(0.5uhr));
ASSERT_EQ(countlsfx(0.5ulr), LIBC_NAMESPACE::countlslr(0.5ulr));
ASSERT_EQ(countlsfx(0.5uk), LIBC_NAMESPACE::countlsk(0.5uk));
ASSERT_EQ(countlsfx(0.5uhk), LIBC_NAMESPACE::countlshk(0.5uhk));
ASSERT_EQ(countlsfx(0.5ulk), LIBC_NAMESPACE::countlslk(0.5ulk));
}

Loading