[libc][math] Refactor fmaximum_num-fminimum_num family to header-only (#194562)

Refactors the fmaximum_num-fminimum_num math family to be header-only.

part of: #147386

Target Functions:
  - fmaximum_num
  - fmaximum_numbf16
  - fmaximum_numf
  - fmaximum_numf128
  - fmaximum_numf16
  - fmaximum_numl
  - fminimum_num
  - fminimum_numbf16
  - fminimum_numf
  - fminimum_numf128
  - fminimum_numf16
  - fminimum_numl

libc/shared/math.h

@@ -181,6 +181,12 @@
 #include "math/fmaximum_mag_num.h"
 #include "math/fmaximum_mag_numbf16.h"
 #include "math/fmaximum_mag_numf.h"
+#include "math/fmaximum_num.h"
+#include "math/fmaximum_numbf16.h"
+#include "math/fmaximum_numf.h"
+#include "math/fmaximum_numf128.h"
+#include "math/fmaximum_numf16.h"
+#include "math/fmaximum_numl.h"
 #include "math/fmaximumbf16.h"
 #include "math/fmaximumf.h"
 #include "math/fmaximumf128.h"
@@ -193,6 +199,12 @@
 #include "math/fminf128.h"
 #include "math/fminf16.h"
 #include "math/fminimum.h"
+#include "math/fminimum_num.h"
+#include "math/fminimum_numbf16.h"
+#include "math/fminimum_numf.h"
+#include "math/fminimum_numf128.h"
+#include "math/fminimum_numf16.h"
+#include "math/fminimum_numl.h"
 #include "math/fminimumbf16.h"
 #include "math/fminimumf.h"
 #include "math/fminimumf128.h"

libc/shared/math/fmaximum_num.h

@@ -0,0 +1,23 @@
+//===-- Shared fmaximum_num function ----------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUM_H
+#define LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUM_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fmaximum_num.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fmaximum_num;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUM_H

libc/shared/math/fmaximum_numbf16.h

@@ -0,0 +1,23 @@
+//===-- Shared fmaximum_numbf16 function ------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMBF16_H
+#define LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMBF16_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fmaximum_numbf16.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fmaximum_numbf16;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMBF16_H

libc/shared/math/fmaximum_numf.h

@@ -0,0 +1,23 @@
+//===-- Shared fmaximum_numf function ---------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF_H
+#define LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fmaximum_numf.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fmaximum_numf;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF_H

libc/shared/math/fmaximum_numf128.h

@@ -0,0 +1,29 @@
+//===-- Shared fmaximum_numf128 function ------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF128_H
+#define LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF128_H
+
+#include "include/llvm-libc-types/float128.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT128
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fmaximum_numf128.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fmaximum_numf128;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT128
+
+#endif // LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF128_H

libc/shared/math/fmaximum_numf16.h

@@ -0,0 +1,29 @@
+//===-- Shared fmaximum_numf16 function -------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF16_H
+#define LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF16_H
+
+#include "include/llvm-libc-macros/float16-macros.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT16
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fmaximum_numf16.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fmaximum_numf16;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT16
+
+#endif // LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUMF16_H

libc/shared/math/fmaximum_numl.h

@@ -0,0 +1,23 @@
+//===-- Shared fmaximum_numl function ---------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUML_H
+#define LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUML_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fmaximum_numl.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fmaximum_numl;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMAXIMUM_NUML_H

libc/shared/math/fminimum_num.h

@@ -0,0 +1,23 @@
+//===-- Shared fminimum_num function ----------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMINIMUM_NUM_H
+#define LLVM_LIBC_SHARED_MATH_FMINIMUM_NUM_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fminimum_num.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fminimum_num;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMINIMUM_NUM_H

libc/shared/math/fminimum_numbf16.h

@@ -0,0 +1,23 @@
+//===-- Shared fminimum_numbf16 function ------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMBF16_H
+#define LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMBF16_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fminimum_numbf16.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fminimum_numbf16;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMBF16_H

libc/shared/math/fminimum_numf.h

@@ -0,0 +1,23 @@
+//===-- Shared fminimum_numf function ---------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF_H
+#define LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fminimum_numf.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fminimum_numf;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF_H

libc/shared/math/fminimum_numf128.h

@@ -0,0 +1,29 @@
+//===-- Shared fminimum_numf128 function ------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF128_H
+#define LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF128_H
+
+#include "include/llvm-libc-types/float128.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT128
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fminimum_numf128.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fminimum_numf128;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT128
+
+#endif // LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF128_H

libc/shared/math/fminimum_numf16.h

@@ -0,0 +1,29 @@
+//===-- Shared fminimum_numf16 function -------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF16_H
+#define LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF16_H
+
+#include "include/llvm-libc-macros/float16-macros.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT16
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fminimum_numf16.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fminimum_numf16;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT16
+
+#endif // LLVM_LIBC_SHARED_MATH_FMINIMUM_NUMF16_H

libc/shared/math/fminimum_numl.h

@@ -0,0 +1,23 @@
+//===-- Shared fminimum_numl function ---------------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SHARED_MATH_FMINIMUM_NUML_H
+#define LLVM_LIBC_SHARED_MATH_FMINIMUM_NUML_H
+
+#include "shared/libc_common.h"
+#include "src/__support/math/fminimum_numl.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace shared {
+
+using math::fminimum_numl;
+
+} // namespace shared
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SHARED_MATH_FMINIMUM_NUML_H

libc/src/__support/FPUtil/BasicOperations.h

@@ -200,7 +200,7 @@ LIBC_INLINE constexpr T fmaximum_num(T x, T y) {
 }
 
 template <typename T, cpp::enable_if_t<cpp::is_floating_point_v<T>, int> = 0>
-LIBC_INLINE T fminimum_num(T x, T y) {
+LIBC_INLINE constexpr T fminimum_num(T x, T y) {
   FPBits<T> bitx(x), bity(y);
   if (bitx.is_signaling_nan() || bity.is_signaling_nan()) {
     fputil::raise_except_if_required(FE_INVALID);

libc/src/__support/math/CMakeLists.txt

@@ -894,6 +894,73 @@ add_header_library(
     libc.src.__support.FPUtil.basic_operations
     libc.src.__support.macros.config
 )
+
+add_header_library(
+  fmaximum_num
+  HDRS
+    fmaximum_num.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fmaximum_numbf16
+  HDRS
+    fmaximum_numbf16.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.FPUtil.bfloat16
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fmaximum_numf
+  HDRS
+    fmaximum_numf.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fmaximum_numf128
+  HDRS
+    fmaximum_numf128.h
+  DEPENDS
+    libc.include.llvm-libc-types.float128
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+)
+
+add_header_library(
+  fmaximum_numf16
+  HDRS
+    fmaximum_numf16.h
+  DEPENDS
+    libc.include.llvm-libc-macros.float16_macros
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fmaximum_numl
+  HDRS
+    fmaximum_numl.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+)
+
+
 add_header_library(
   fmin
   HDRS
@@ -1016,6 +1083,71 @@ add_header_library(
     libc.src.__support.macros.config
 )
 
+add_header_library(
+  fminimum_num
+  HDRS
+    fminimum_num.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fminimum_numbf16
+  HDRS
+    fminimum_numbf16.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.FPUtil.bfloat16
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fminimum_numf
+  HDRS
+    fminimum_numf.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fminimum_numf128
+  HDRS
+    fminimum_numf128.h
+  DEPENDS
+    libc.include.llvm-libc-types.float128
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+)
+
+add_header_library(
+  fminimum_numf16
+  HDRS
+    fminimum_numf16.h
+  DEPENDS
+    libc.include.llvm-libc-macros.float16_macros
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+  FLAGS
+    MISC_MATH_BASIC_OPS_OPT
+)
+
+add_header_library(
+  fminimum_numl
+  HDRS
+    fminimum_numl.h
+  DEPENDS
+    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.macros.config
+)
+
 add_header_library(
   fminl
   HDRS

libc/src/__support/math/fmaximum_num.h

@@ -0,0 +1,25 @@
+//===-- Implementation header for fmaximum_num ------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUM_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUM_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr double fmaximum_num(double x, double y) {
+  return fputil::fmaximum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUM_H

libc/src/__support/math/fmaximum_numbf16.h

@@ -0,0 +1,26 @@
+//===-- Implementation header for fmaximum_numbf16 --------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMBF16_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMBF16_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/FPUtil/bfloat16.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr bfloat16 fmaximum_numbf16(bfloat16 x, bfloat16 y) {
+  return fputil::fmaximum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMBF16_H

libc/src/__support/math/fmaximum_numf.h

@@ -0,0 +1,25 @@
+//===-- Implementation header for fmaximum_numf -----------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr float fmaximum_numf(float x, float y) {
+  return fputil::fmaximum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF_H

libc/src/__support/math/fmaximum_numf128.h

@@ -0,0 +1,31 @@
+//===-- Implementation header for fmaximum_numf128 --------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF128_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF128_H
+
+#include "include/llvm-libc-types/float128.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT128
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr float128 fmaximum_numf128(float128 x, float128 y) {
+  return fputil::fmaximum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT128
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF128_H

libc/src/__support/math/fmaximum_numf16.h

@@ -0,0 +1,31 @@
+//===-- Implementation header for fmaximum_numf16 ---------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF16_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF16_H
+
+#include "include/llvm-libc-macros/float16-macros.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT16
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr float16 fmaximum_numf16(float16 x, float16 y) {
+  return fputil::fmaximum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT16
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUMF16_H

libc/src/__support/math/fmaximum_numl.h

@@ -0,0 +1,25 @@
+//===-- Implementation header for fmaximum_numl -----------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUML_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUML_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr long double fmaximum_numl(long double x, long double y) {
+  return fputil::fmaximum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMAXIMUM_NUML_H

libc/src/__support/math/fminimum_num.h

@@ -0,0 +1,25 @@
+//===-- Implementation header for fminimum_num ------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUM_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUM_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr double fminimum_num(double x, double y) {
+  return fputil::fminimum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUM_H

libc/src/__support/math/fminimum_numbf16.h

@@ -0,0 +1,26 @@
+//===-- Implementation header for fminimum_numbf16 --------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMBF16_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMBF16_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/FPUtil/bfloat16.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr bfloat16 fminimum_numbf16(bfloat16 x, bfloat16 y) {
+  return fputil::fminimum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMBF16_H

libc/src/__support/math/fminimum_numf.h

@@ -0,0 +1,25 @@
+//===-- Implementation header for fminimum_numf -----------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr float fminimum_numf(float x, float y) {
+  return fputil::fminimum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF_H

libc/src/__support/math/fminimum_numf128.h

@@ -0,0 +1,31 @@
+//===-- Implementation header for fminimum_numf128 --------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF128_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF128_H
+
+#include "include/llvm-libc-types/float128.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT128
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr float128 fminimum_numf128(float128 x, float128 y) {
+  return fputil::fminimum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT128
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF128_H

libc/src/__support/math/fminimum_numf16.h

@@ -0,0 +1,31 @@
+//===-- Implementation header for fminimum_numf16 ---------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF16_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF16_H
+
+#include "include/llvm-libc-macros/float16-macros.h"
+
+#ifdef LIBC_TYPES_HAS_FLOAT16
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr float16 fminimum_numf16(float16 x, float16 y) {
+  return fputil::fminimum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LIBC_TYPES_HAS_FLOAT16
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUMF16_H

libc/src/__support/math/fminimum_numl.h

@@ -0,0 +1,25 @@
+//===-- Implementation header for fminimum_numl -----------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUML_H
+#define LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUML_H
+
+#include "src/__support/FPUtil/BasicOperations.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+namespace math {
+
+LIBC_INLINE constexpr long double fminimum_numl(long double x, long double y) {
+  return fputil::fminimum_num(x, y);
+}
+
+} // namespace math
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC___SUPPORT_MATH_FMINIMUM_NUML_H

libc/src/math/generic/CMakeLists.txt

@@ -2247,9 +2247,7 @@ add_entrypoint_object(
   HDRS
     ../fmaximum_num.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fmaximum_num
 )
 
 add_entrypoint_object(
@@ -2259,9 +2257,7 @@ add_entrypoint_object(
   HDRS
     ../fmaximum_numf.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fmaximum_numf
 )
 
 add_entrypoint_object(
@@ -2271,7 +2267,7 @@ add_entrypoint_object(
   HDRS
     ../fmaximum_numl.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.math.fmaximum_numl
 )
 
 add_entrypoint_object(
@@ -2281,10 +2277,7 @@ add_entrypoint_object(
   HDRS
     ../fmaximum_numf16.h
   DEPENDS
-    libc.src.__support.macros.properties.types
-    libc.src.__support.FPUtil.basic_operations
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fmaximum_numf16
 )
 
 add_entrypoint_object(
@@ -2294,8 +2287,7 @@ add_entrypoint_object(
   HDRS
     ../fmaximum_numf128.h
   DEPENDS
-    libc.src.__support.macros.properties.types
-    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.math.fmaximum_numf128
 )
 
 add_entrypoint_object(
@@ -2305,12 +2297,7 @@ add_entrypoint_object(
   HDRS
     ../fmaximum_numbf16.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
-    libc.src.__support.FPUtil.bfloat16
-    libc.src.__support.macros.config
-    libc.src.__support.macros.properties.types
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fmaximum_numbf16
 )
 
 add_entrypoint_object(
@@ -2509,9 +2496,7 @@ add_entrypoint_object(
   HDRS
     ../fminimum_num.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fminimum_num
 )
 
 add_entrypoint_object(
@@ -2521,9 +2506,7 @@ add_entrypoint_object(
   HDRS
     ../fminimum_numf.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fminimum_numf
 )
 
 add_entrypoint_object(
@@ -2533,7 +2516,7 @@ add_entrypoint_object(
   HDRS
     ../fminimum_numl.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.math.fminimum_numl
 )
 
 add_entrypoint_object(
@@ -2543,10 +2526,7 @@ add_entrypoint_object(
   HDRS
     ../fminimum_numf16.h
   DEPENDS
-    libc.src.__support.macros.properties.types
-    libc.src.__support.FPUtil.basic_operations
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fminimum_numf16
 )
 
 add_entrypoint_object(
@@ -2556,8 +2536,7 @@ add_entrypoint_object(
   HDRS
     ../fminimum_numf128.h
   DEPENDS
-    libc.src.__support.macros.properties.types
-    libc.src.__support.FPUtil.basic_operations
+    libc.src.__support.math.fminimum_numf128
 )
 
 add_entrypoint_object(
@@ -2567,12 +2546,7 @@ add_entrypoint_object(
   HDRS
     ../fminimum_numbf16.h
   DEPENDS
-    libc.src.__support.FPUtil.basic_operations
-    libc.src.__support.FPUtil.bfloat16
-    libc.src.__support.macros.config
-    libc.src.__support.macros.properties.types
-  FLAGS
-    MISC_MATH_BASIC_OPS_OPT
+    libc.src.__support.math.fminimum_numbf16
 )
 
 add_entrypoint_object(

libc/src/math/generic/fmaximum_num.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fmaximum_num.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fmaximum_num.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(double, fmaximum_num, (double x, double y)) {
-  return fputil::fmaximum_num(x, y);
+  return math::fmaximum_num(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fmaximum_numbf16.cpp

@@ -7,15 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fmaximum_numbf16.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/FPUtil/bfloat16.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fmaximum_numbf16.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(bfloat16, fmaximum_numbf16, (bfloat16 x, bfloat16 y)) {
-  return fputil::fmaximum_num(x, y);
+  return math::fmaximum_numbf16(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fmaximum_numf.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fmaximum_numf.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fmaximum_numf.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float, fmaximum_numf, (float x, float y)) {
-  return fputil::fmaximum_num(x, y);
+  return math::fmaximum_numf(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fmaximum_numf128.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fmaximum_numf128.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fmaximum_numf128.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float128, fmaximum_numf128, (float128 x, float128 y)) {
-  return fputil::fmaximum_num(x, y);
+  return math::fmaximum_numf128(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fmaximum_numf16.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fmaximum_numf16.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fmaximum_numf16.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float16, fmaximum_numf16, (float16 x, float16 y)) {
-  return fputil::fmaximum_num(x, y);
+  return math::fmaximum_numf16(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fmaximum_numl.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fmaximum_numl.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fmaximum_numl.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(long double, fmaximum_numl, (long double x, long double y)) {
-  return fputil::fmaximum_num(x, y);
+  return math::fmaximum_numl(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fminimum_num.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fminimum_num.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fminimum_num.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(double, fminimum_num, (double x, double y)) {
-  return fputil::fminimum_num(x, y);
+  return math::fminimum_num(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fminimum_numbf16.cpp

@@ -7,15 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fminimum_numbf16.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/FPUtil/bfloat16.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fminimum_numbf16.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(bfloat16, fminimum_numbf16, (bfloat16 x, bfloat16 y)) {
-  return fputil::fminimum_num(x, y);
+  return math::fminimum_numbf16(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fminimum_numf.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fminimum_numf.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fminimum_numf.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float, fminimum_numf, (float x, float y)) {
-  return fputil::fminimum_num(x, y);
+  return math::fminimum_numf(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fminimum_numf128.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fminimum_numf128.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fminimum_numf128.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float128, fminimum_numf128, (float128 x, float128 y)) {
-  return fputil::fminimum_num(x, y);
+  return math::fminimum_numf128(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fminimum_numf16.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fminimum_numf16.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fminimum_numf16.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(float16, fminimum_numf16, (float16 x, float16 y)) {
-  return fputil::fminimum_num(x, y);
+  return math::fminimum_numf16(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/math/generic/fminimum_numl.cpp

@@ -7,14 +7,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/math/fminimum_numl.h"
-#include "src/__support/FPUtil/BasicOperations.h"
-#include "src/__support/common.h"
-#include "src/__support/macros/config.h"
+#include "src/__support/math/fminimum_numl.h"
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(long double, fminimum_numl, (long double x, long double y)) {
-  return fputil::fminimum_num(x, y);
+  return math::fminimum_numl(x, y);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/test/shared/CMakeLists.txt

@@ -178,6 +178,12 @@ add_fp_unittest(
     libc.src.__support.math.fmaximum_mag_num
     libc.src.__support.math.fmaximum_mag_numbf16
     libc.src.__support.math.fmaximum_mag_numf
+    libc.src.__support.math.fmaximum_num
+    libc.src.__support.math.fmaximum_numbf16
+    libc.src.__support.math.fmaximum_numf
+    libc.src.__support.math.fmaximum_numf128
+    libc.src.__support.math.fmaximum_numf16
+    libc.src.__support.math.fmaximum_numl
     libc.src.__support.math.fmaximumbf16
     libc.src.__support.math.fmaximumf
     libc.src.__support.math.fmaximumf128
@@ -190,6 +196,12 @@ add_fp_unittest(
     libc.src.__support.math.fminf128
     libc.src.__support.math.fminf16
     libc.src.__support.math.fminimum
+    libc.src.__support.math.fminimum_num
+    libc.src.__support.math.fminimum_numbf16
+    libc.src.__support.math.fminimum_numf
+    libc.src.__support.math.fminimum_numf128
+    libc.src.__support.math.fminimum_numf16
+    libc.src.__support.math.fminimum_numl
     libc.src.__support.math.fminimumbf16
     libc.src.__support.math.fminimumf
     libc.src.__support.math.fminimumf128
@@ -362,6 +374,12 @@ add_fp_unittest(
     libc.src.__support.math.fmaximum_mag_num
     libc.src.__support.math.fmaximum_mag_numbf16
     libc.src.__support.math.fmaximum_mag_numf
+    libc.src.__support.math.fmaximum_num
+    libc.src.__support.math.fmaximum_numbf16
+    libc.src.__support.math.fmaximum_numf
+    libc.src.__support.math.fmaximum_numf128
+    libc.src.__support.math.fmaximum_numf16
+    libc.src.__support.math.fmaximum_numl
     libc.src.__support.math.fmaximumbf16
     libc.src.__support.math.fmaximumf
     libc.src.__support.math.fmaximumf128
@@ -373,6 +391,12 @@ add_fp_unittest(
     libc.src.__support.math.fminf128
     libc.src.__support.math.fminf16
     libc.src.__support.math.fminimum
+    libc.src.__support.math.fminimum_num
+    libc.src.__support.math.fminimum_numbf16
+    libc.src.__support.math.fminimum_numf
+    libc.src.__support.math.fminimum_numf128
+    libc.src.__support.math.fminimum_numf16
+    libc.src.__support.math.fminimum_numl
     libc.src.__support.math.fminimumbf16
     libc.src.__support.math.fminimumf
     libc.src.__support.math.fminimumf128

libc/test/shared/shared_math_constexpr_test.cpp

@@ -27,6 +27,8 @@ static_assert(0.0 == LIBC_NAMESPACE::shared::fmaximum(0.0, 0.0));
 static_assert(0.0 == LIBC_NAMESPACE::shared::fminimum(0.0, 0.0));
 static_assert(0.0 == LIBC_NAMESPACE::shared::fmin(0.0, 0.0));
 static_assert(0.0 == LIBC_NAMESPACE::shared::fmax(0.0, 0.0));
+static_assert(0.0 == LIBC_NAMESPACE::shared::fmaximum_num(0.0, 0.0));
+static_assert(0.0 == LIBC_NAMESPACE::shared::fminimum_num(0.0, 0.0));
 
 //===----------------------------------------------------------------------===//
 //                       Float Tests
@@ -42,6 +44,8 @@ static_assert(0.0f == LIBC_NAMESPACE::shared::fmaximumf(0.0f, 0.0f));
 static_assert(0.0f == LIBC_NAMESPACE::shared::fminimumf(0.0f, 0.0f));
 static_assert(0.0f == LIBC_NAMESPACE::shared::fminf(0.0f, 0.0f));
 static_assert(0.0f == LIBC_NAMESPACE::shared::fmaxf(0.0f, 0.0f));
+static_assert(0.0f == LIBC_NAMESPACE::shared::fmaximum_numf(0.0f, 0.0f));
+static_assert(0.0f == LIBC_NAMESPACE::shared::fminimum_numf(0.0f, 0.0f));
 
 //===----------------------------------------------------------------------===//
 //                       Float16 Tests
@@ -58,6 +62,10 @@ static_assert(0.0f16 == LIBC_NAMESPACE::shared::fmaximumf16(0.0f16, 0.0f16));
 static_assert(0.0f16 == LIBC_NAMESPACE::shared::fminimumf16(0.0f16, 0.0f16));
 static_assert(0.0f16 == LIBC_NAMESPACE::shared::fminf16(0.0f16, 0.0f16));
 static_assert(0.0f16 == LIBC_NAMESPACE::shared::fmaxf16(0.0f16, 0.0f16));
+static_assert(0.0f16 ==
+              LIBC_NAMESPACE::shared::fmaximum_numf16(0.0f16, 0.0f16));
+static_assert(0.0f16 ==
+              LIBC_NAMESPACE::shared::fminimum_numf16(0.0f16, 0.0f16));
 
 #endif // LIBC_TYPES_HAS_FLOAT16
 
@@ -82,6 +90,8 @@ static_assert(0.0L == LIBC_NAMESPACE::shared::fmaximuml(0.0L, 0.0L));
 static_assert(0.0L == LIBC_NAMESPACE::shared::fminimuml(0.0L, 0.0L));
 static_assert(0.0L == LIBC_NAMESPACE::shared::fminl(0.0L, 0.0L));
 static_assert(0.0L == LIBC_NAMESPACE::shared::fmaxl(0.0L, 0.0L));
+static_assert(0.0L == LIBC_NAMESPACE::shared::fmaximum_numl(0.0L, 0.0L));
+static_assert(0.0L == LIBC_NAMESPACE::shared::fminimum_numl(0.0L, 0.0L));
 
 #endif
 
@@ -119,6 +129,12 @@ static_assert(0.0 == LIBC_NAMESPACE::shared::dsqrtf128(float128(0.0)));
 
 static_assert(float128(0.0) ==
               LIBC_NAMESPACE::shared::fmaxf128(float128(0.0), float128(0.0)));
+static_assert(float128(0.0) ==
+              LIBC_NAMESPACE::shared::fmaximum_numf128(float128(0.0),
+                                                       float128(0.0)));
+static_assert(float128(0.0) ==
+              LIBC_NAMESPACE::shared::fminimum_numf128(float128(0.0),
+                                                       float128(0.0)));
 
 #endif // LIBC_TYPES_HAS_FLOAT128
 
@@ -154,5 +170,11 @@ static_assert(bfloat16(0.0) ==
               LIBC_NAMESPACE::shared::fminbf16(bfloat16(0.0), bfloat16(0.0)));
 static_assert(bfloat16(0.0) ==
               LIBC_NAMESPACE::shared::fmaxbf16(bfloat16(0.0), bfloat16(0.0)));
+static_assert(bfloat16(0.0) ==
+              LIBC_NAMESPACE::shared::fmaximum_numbf16(bfloat16(0.0),
+                                                       bfloat16(0.0)));
+static_assert(bfloat16(0.0) ==
+              LIBC_NAMESPACE::shared::fminimum_numbf16(bfloat16(0.0),
+                                                       bfloat16(0.0)));
 
 TEST(LlvmLibcSharedMathTest, ConstantEvaluation) {}

libc/test/shared/shared_math_test.cpp

@@ -106,6 +106,10 @@ TEST(LlvmLibcSharedMathTest, AllFloat16) {
   EXPECT_FP_EQ(0x0p+0f16, LIBC_NAMESPACE::shared::fmaximumf16(0.0f16, 0.0f16));
   EXPECT_FP_EQ(0x0p+0f16, LIBC_NAMESPACE::shared::fminimumf16(0.0f16, 0.0f16));
   EXPECT_FP_EQ(0x0p+0f16, LIBC_NAMESPACE::shared::fminf16(0.0f16, 0.0f16));
+  EXPECT_FP_EQ(0x0p+0f16,
+               LIBC_NAMESPACE::shared::fmaximum_numf16(0.0f16, 0.0f16));
+  EXPECT_FP_EQ(0x0p+0f16,
+               LIBC_NAMESPACE::shared::fminimum_numf16(0.0f16, 0.0f16));
 }
 
 #endif // LIBC_TYPES_HAS_FLOAT16
@@ -220,6 +224,8 @@ TEST(LlvmLibcSharedMathTest, AllFloat) {
   EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::fmaximumf(0.0f, 0.0f));
   EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::fminimumf(0.0f, 0.0f));
   EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::fminf(0.0f, 0.0f));
+  EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::fmaximum_numf(0.0f, 0.0f));
+  EXPECT_FP_EQ(0x0p+0f, LIBC_NAMESPACE::shared::fminimum_numf(0.0f, 0.0f));
 }
 
 TEST(LlvmLibcSharedMathTest, AllDouble) {
@@ -310,6 +316,8 @@ TEST(LlvmLibcSharedMathTest, AllDouble) {
   EXPECT_FP_EQ(0.0, LIBC_NAMESPACE::shared::fmaximum(0.0, 0.0));
   EXPECT_FP_EQ(0.0, LIBC_NAMESPACE::shared::fminimum(0.0, 0.0));
   EXPECT_FP_EQ(0.0, LIBC_NAMESPACE::shared::fmin(0.0, 0.0));
+  EXPECT_FP_EQ(0.0, LIBC_NAMESPACE::shared::fmaximum_num(0.0, 0.0));
+  EXPECT_FP_EQ(0.0, LIBC_NAMESPACE::shared::fminimum_num(0.0, 0.0));
 }
 
 // TODO: Enable the tests when double-double type is supported.
@@ -381,6 +389,8 @@ TEST(LlvmLibcSharedMathTest, AllLongDouble) {
   EXPECT_FP_EQ(0x0p+0L, LIBC_NAMESPACE::shared::fmaximuml(0.0L, 0.0L));
   EXPECT_FP_EQ(0x0p+0L, LIBC_NAMESPACE::shared::fminimuml(0.0L, 0.0L));
   EXPECT_FP_EQ(0x0p+0L, LIBC_NAMESPACE::shared::fminl(0.0L, 0.0L));
+  EXPECT_FP_EQ(0x0p+0L, LIBC_NAMESPACE::shared::fmaximum_numl(0.0L, 0.0L));
+  EXPECT_FP_EQ(0x0p+0L, LIBC_NAMESPACE::shared::fminimum_numl(0.0L, 0.0L));
 }
 
 #endif // LIBC_TYPES_LONG_DOUBLE_IS_DOUBLE_DOUBLE
@@ -495,6 +505,10 @@ TEST(LlvmLibcSharedMathTest, AllFloat128) {
                                   float128(0.0), float128(0.0)));
   EXPECT_FP_EQ(float128(0.0),
                LIBC_NAMESPACE::shared::fminf128(float128(0.0), float128(0.0)));
+  EXPECT_FP_EQ(float128(0.0), LIBC_NAMESPACE::shared::fmaximum_numf128(
+                                  float128(0.0), float128(0.0)));
+  EXPECT_FP_EQ(float128(0.0), LIBC_NAMESPACE::shared::fminimum_numf128(
+                                  float128(0.0), float128(0.0)));
 }
 
 #endif // LIBC_TYPES_HAS_FLOAT128
@@ -572,4 +586,8 @@ TEST(LlvmLibcSharedMathTest, AllBFloat16) {
                                   bfloat16(0.0), bfloat16(0.0)));
   EXPECT_FP_EQ(bfloat16(0.0),
                LIBC_NAMESPACE::shared::fminbf16(bfloat16(0.0), bfloat16(0.0)));
+  EXPECT_FP_EQ(bfloat16(0.0), LIBC_NAMESPACE::shared::fmaximum_numbf16(
+                                  bfloat16(0.0), bfloat16(0.0)));
+  EXPECT_FP_EQ(bfloat16(0.0), LIBC_NAMESPACE::shared::fminimum_numbf16(
+                                  bfloat16(0.0), bfloat16(0.0)));
 }

utils/bazel/llvm-project-overlay/libc/BUILD.bazel

@@ -4013,6 +4013,63 @@ libc_support_library(
     ],
 )
 
+libc_support_library(
+    name = "__support_math_fmaximum_num",
+    hdrs = ["src/__support/math/fmaximum_num.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fmaximum_numbf16",
+    hdrs = ["src/__support/math/fmaximum_numbf16.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_fputil_bfloat16",
+        ":__support_macros_config",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fmaximum_numf",
+    hdrs = ["src/__support/math/fmaximum_numf.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fmaximum_numf128",
+    hdrs = ["src/__support/math/fmaximum_numf128.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+        ":llvm_libc_types_float128",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fmaximum_numf16",
+    hdrs = ["src/__support/math/fmaximum_numf16.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+        ":llvm_libc_macros_float16_macros",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fmaximum_numl",
+    hdrs = ["src/__support/math/fmaximum_numl.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+    ],
+)
+
 libc_support_library(
     name = "__support_math_fmin",
     hdrs = ["src/__support/math/fmin.h"],
@@ -4118,6 +4175,63 @@ libc_support_library(
     ],
 )
 
+libc_support_library(
+    name = "__support_math_fminimum_num",
+    hdrs = ["src/__support/math/fminimum_num.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fminimum_numbf16",
+    hdrs = ["src/__support/math/fminimum_numbf16.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_fputil_bfloat16",
+        ":__support_macros_config",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fminimum_numf",
+    hdrs = ["src/__support/math/fminimum_numf.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fminimum_numf128",
+    hdrs = ["src/__support/math/fminimum_numf128.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+        ":llvm_libc_types_float128",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fminimum_numf16",
+    hdrs = ["src/__support/math/fminimum_numf16.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+        ":llvm_libc_macros_float16_macros",
+    ],
+)
+
+libc_support_library(
+    name = "__support_math_fminimum_numl",
+    hdrs = ["src/__support/math/fminimum_numl.h"],
+    deps = [
+        ":__support_fputil_basic_operations",
+        ":__support_macros_config",
+    ],
+)
+
 libc_support_library(
     name = "__support_math_fminl",
     hdrs = ["src/__support/math/fminl.h"],
@@ -7411,6 +7525,13 @@ libc_math_function(
     ],
 )
 
+libc_math_function(
+    name = "fmaximum_numbf16",
+    additional_deps = [
+        ":__support_math_fmaximum_numbf16",
+    ],
+)
+
 libc_math_function(
     name = "fminbf16",
     additional_deps = [
@@ -7425,6 +7546,13 @@ libc_math_function(
     ],
 )
 
+libc_math_function(
+    name = "fminimum_numbf16",
+    additional_deps = [
+        ":__support_math_fminimum_numbf16",
+    ],
+)
+
 libc_math_function(
     name = "ilogbbf16",
     additional_deps = [
@@ -8304,18 +8432,39 @@ libc_math_function(
     name = "fmaximum_mag_numf16",
 )
 
-libc_math_function(name = "fmaximum_num")
+libc_math_function(
+    name = "fmaximum_num",
+    additional_deps = [
+        ":__support_math_fmaximum_num",
+    ],
+)
 
-libc_math_function(name = "fmaximum_numf")
+libc_math_function(
+    name = "fmaximum_numf",
+    additional_deps = [
+        ":__support_math_fmaximum_numf",
+    ],
+)
 
-libc_math_function(name = "fmaximum_numl")
+libc_math_function(
+    name = "fmaximum_numl",
+    additional_deps = [
+        ":__support_math_fmaximum_numl",
+    ],
+)
 
 libc_math_function(
     name = "fmaximum_numf128",
+    additional_deps = [
+        ":__support_math_fmaximum_numf128",
+    ],
 )
 
 libc_math_function(
     name = "fmaximum_numf16",
+    additional_deps = [
+        ":__support_math_fmaximum_numf16",
+    ],
 )
 
 libc_math_function(
@@ -8416,18 +8565,39 @@ libc_math_function(
     name = "fminimum_mag_numf16",
 )
 
-libc_math_function(name = "fminimum_num")
+libc_math_function(
+    name = "fminimum_num",
+    additional_deps = [
+        ":__support_math_fminimum_num",
+    ],
+)
 
-libc_math_function(name = "fminimum_numf")
+libc_math_function(
+    name = "fminimum_numf",
+    additional_deps = [
+        ":__support_math_fminimum_numf",
+    ],
+)
 
-libc_math_function(name = "fminimum_numl")
+libc_math_function(
+    name = "fminimum_numl",
+    additional_deps = [
+        ":__support_math_fminimum_numl",
+    ],
+)
 
 libc_math_function(
     name = "fminimum_numf128",
+    additional_deps = [
+        ":__support_math_fminimum_numf128",
+    ],
 )
 
 libc_math_function(
     name = "fminimum_numf16",
+    additional_deps = [
+        ":__support_math_fminimum_numf16",
+    ],
 )
 
 libc_math_function(