Merge branch 'main' into fix-boolean-expr-check

Author: Anshul200677

libc/shared/math/expf.h

@@ -11,7 +11,6 @@
 
 #include "shared/libc_common.h"
 #include "src/__support/math/expf.h"
-#include "src/__support/math/expf_static_rounding.h"
 
 namespace LIBC_NAMESPACE_DECL {
 namespace shared {

libc/src/__support/math/expf_static_rounding.h

@@ -657,11 +657,6 @@ endif()
 
 set(LLVM_ENABLE_Z3_SOLVER_DEFAULT "${Z3_FOUND}")
 
-include(FindLibcCommonUtils)
-if(NOT TARGET llvm-libc-common-utilities)
-  message(FATAL_ERROR "LLVM libc is not found at ${libc_path}.")
-endif()
-
 
 if( LLVM_TARGETS_TO_BUILD STREQUAL "all" )
   set( LLVM_TARGETS_TO_BUILD ${LLVM_ALL_TARGETS} )

llvm/CMakeLists.txt

@@ -1493,8 +1493,6 @@ class APFloat : public APFloatBase {
   friend APFloat frexp(const APFloat &X, int &Exp, roundingMode RM);
   friend IEEEFloat;
   friend DoubleAPFloat;
-
-  friend APFloat exp(const APFloat &X, roundingMode RM);
 };
 
 static_assert(sizeof(APFloat) == sizeof(detail::IEEEFloat),
@@ -1647,10 +1645,6 @@ inline APFloat maximumnum(const APFloat &A, const APFloat &B) {
   return A < B ? B : A;
 }
 
-/// Implement IEEE 754-2019 exp functions.
-LLVM_READONLY
-APFloat exp(const APFloat &X, RoundingMode RM = APFloat::rmNearestTiesToEven);
-
 inline raw_ostream &operator<<(raw_ostream &OS, const APFloat &V) {
   V.print(OS);
   return OS;

llvm/include/llvm/ADT/APFloat.h

@@ -28,9 +28,6 @@
 #include <cstring>
 #include <limits.h>
 
-// Shared headers from LLVM libc
-#include "shared/math.h"
-
 #define APFLOAT_DISPATCH_ON_SEMANTICS(METHOD_CALL)                             \
   do {                                                                         \
     if (usesLayout<IEEEFloat>(getSemantics()))                                 \
@@ -6158,29 +6155,6 @@ float APFloat::convertToFloat() const {
   return Temp.getIEEE().convertToFloat();
 }
 
-static constexpr int getFEnvRoundingMode(llvm::RoundingMode rm) {
-  switch (rm) {
-  case APFloat::rmTowardPositive:
-    return FE_UPWARD;
-  case APFloat::rmTowardNegative:
-    return FE_DOWNWARD;
-  case APFloat::rmTowardZero:
-    return FE_TOWARDZERO;
-  default:
-    // TODO: fix rmNearestTiesToAway for platform without FE_TONEARESTFROMZERO.
-    return FE_TONEAREST;
-  };
-}
-
-APFloat exp(const APFloat &X, RoundingMode rounding_mode) {
-  if (&X.getSemantics() == &APFloat::IEEEsingle()) {
-    float result = LIBC_NAMESPACE::shared::expf(
-        X.convertToFloat(), getFEnvRoundingMode(rounding_mode));
-    return APFloat(result);
-  }
-  llvm_unreachable("Unsupported floating-point semantics");
-}
-
 APFloat::Storage::~Storage() {
   if (usesLayout<IEEEFloat>(*semantics)) {
     IEEE.~IEEEFloat();

llvm/lib/Support/APFloat.cpp

@@ -395,9 +395,3 @@ target_include_directories(LLVMSupport
   PRIVATE
   ${LLVM_THIRD_PARTY_DIR}/siphash/include
 )
-
-# Integrating LLVM libc's math functions
-target_include_directories(LLVMSupport PRIVATE "${LLVM_SOURCE_DIR}/../libc")
-if(NOT MSVC)
-  target_compile_options(LLVMSupport PRIVATE "-Wno-c99-extensions") # _Complex warnings.
-endif()

llvm/lib/Support/CMakeLists.txt

@@ -1531,7 +1531,7 @@ bool AMDGPULibCalls::evaluateScalarMathFunc(const FuncInfo &FInfo, double &Res0,
     return true;
 
   case AMDGPULibFunc::EI_EXP:
-    Res0 = std::exp(opr0);
+    Res0 = exp(opr0);
     return true;
 
   case AMDGPULibFunc::EI_EXP2:

llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp

@@ -665,9 +665,20 @@ bool SPIRVEmitIntrinsics::walkLogicalAccessChain(
       Offset -= STL->getElementOffset(Element);
       CurType = ST->getElementType(Element);
       OnLiteralIndexing(CurType, Element);
+    } else if (auto *VT = dyn_cast<FixedVectorType>(CurType)) {
+      Type *EltTy = VT->getElementType();
+      TypeSize EltSizeBits = DL.getTypeSizeInBits(EltTy);
+      assert(EltSizeBits % 8 == 0 &&
+             "Element type size in bits must be a multiple of 8.");
+      uint32_t EltTypeSize = EltSizeBits / 8;
+      assert(Offset < VT->getNumElements() * EltTypeSize);
+      uint64_t Index = Offset / EltTypeSize;
+      Offset -= Index * EltTypeSize;
+      CurType = EltTy;
+      OnLiteralIndexing(CurType, Index);
+
     } else {
-      // Vector type indexing should not use GEP.
-      // So if we have an index left, something is wrong. Giving up.
+      // Unknown composite kind; give up.
       return true;
     }
   } while (Offset > 0);

llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp

@@ -0,0 +1,44 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 6
+; RUN: llc -verify-machineinstrs -O3 -mtriple=spirv1.6-unknown-vulkan1.3-compute %s -o - | FileCheck %s
+; RUN: %if spirv-tools %{ llc -O3 -mtriple=spirv1.6-unknown-vulkan1.3-compute %s -o - -filetype=obj | spirv-val %}
+
+; StructuredBuffer<int4> In : register(t0);
+; RWStructuredBuffer<int4> Out : register(u1);
+;
+; [numthreads(1,1,1)]
+; void main() {
+;   Out[0].y = In[0].y;
+; }
+
+@.str = private unnamed_addr constant [3 x i8] c"In\00", align 1
+@.str.2 = private unnamed_addr constant [4 x i8] c"Out\00", align 1
+
+define void @main() local_unnamed_addr #0 {
+; CHECK-LABEL: main
+; CHECK:       %33 = OpFunction %2 None %3 ; -- Begin function main
+; CHECK-NEXT:    %1 = OpLabel
+; CHECK-NEXT:    %34 = OpVariable %20 Function %29
+; CHECK-NEXT:    %35 = OpVariable %19 Function %30
+; CHECK-NEXT:    %36 = OpCopyObject %12 %31
+; CHECK-NEXT:    %37 = OpCopyObject %10 %32
+; CHECK-NEXT:    %38 = OpAccessChain %7 %36 %21 %21
+; CHECK-NEXT:    %39 = OpLoad %6 %38 Aligned 16
+; CHECK-NEXT:    %40 = OpCompositeExtract %4 %39 1
+; CHECK-NEXT:    %41 = OpAccessChain %7 %37 %21 %21
+; CHECK-NEXT:    %42 = OpInBoundsAccessChain %5 %41 %22
+; CHECK-NEXT:    OpStore %42 %40 Aligned 4
+; CHECK-NEXT:    OpReturn
+; CHECK-NEXT:    OpFunctionEnd
+entry:
+  %0 = tail call target("spirv.VulkanBuffer", [0 x <4 x i32>], 12, 0) @llvm.spv.resource.handlefrombinding.tspirv.VulkanBuffer_a0v4i32_12_0t(i32 0, i32 0, i32 1, i32 0, ptr nonnull @.str)
+  %1 = tail call target("spirv.VulkanBuffer", [0 x <4 x i32>], 12, 1) @llvm.spv.resource.handlefrombinding.tspirv.VulkanBuffer_a0v4i32_12_1t(i32 0, i32 1, i32 1, i32 0, ptr nonnull @.str.2)
+  %2 = tail call noundef align 16 dereferenceable(16) ptr addrspace(11) @llvm.spv.resource.getpointer.p11.tspirv.VulkanBuffer_a0v4i32_12_0t(target("spirv.VulkanBuffer", [0 x <4 x i32>], 12, 0) %0, i32 0)
+  %3 = load <4 x i32>, ptr addrspace(11) %2, align 16
+  %4 = extractelement <4 x i32> %3, i64 1
+  %5 = tail call noundef align 16 dereferenceable(16) ptr addrspace(11) @llvm.spv.resource.getpointer.p11.tspirv.VulkanBuffer_a0v4i32_12_1t(target("spirv.VulkanBuffer", [0 x <4 x i32>], 12, 1) %1, i32 0)
+  %6 = getelementptr inbounds nuw i8, ptr addrspace(11) %5, i64 4
+  store i32 %4, ptr addrspace(11) %6, align 4
+  ret void
+}
+
+!0 = !{i32 1, !"wchar_size", i32 4}

llvm/test/CodeGen/SPIRV/pointers/structured-buffer-vector-access.ll

@@ -10182,78 +10182,4 @@ TEST(APFloatTest, FrexpQuietSNaN) {
   EXPECT_FALSE(Result.isSignaling());
 }
 
-TEST(APFloatTest, expf) {
-  std::array<llvm::RoundingMode, 4> allRoundingModes = {
-      APFloat::rmNearestTiesToEven, APFloat::rmTowardPositive,
-      APFloat::rmTowardNegative, APFloat::rmTowardZero};
-  for (auto rm : allRoundingModes) {
-    // exp(+-0) = 1 for all rounding modes.
-    EXPECT_EQ(1.0f, llvm::exp(APFloat(0.0f), rm).convertToFloat());
-    EXPECT_EQ(1.0f, llvm::exp(APFloat(-0.0f), rm).convertToFloat());
-    // exp(+Inf) = +Inf for all rounding modes.
-    EXPECT_EQ(std::numeric_limits<float>::infinity(),
-              llvm::exp(APFloat::getInf(APFloat::IEEEsingle(), false), rm)
-                  .convertToFloat());
-    // exp(-Inf) = 0 for all rounding modes.
-    EXPECT_EQ(0.0f, llvm::exp(APFloat::getInf(APFloat::IEEEsingle(), true), rm)
-                        .convertToFloat());
-    // exp(NaN) = NaN for all rounding modes.
-    EXPECT_TRUE(llvm::exp(APFloat::getNaN(APFloat::IEEEsingle()), rm).isNaN());
-  }
-  // exp(1)
-  EXPECT_EQ(
-      0x1.5bf0a8p1f,
-      llvm::exp(APFloat(1.0f), APFloat::rmNearestTiesToEven).convertToFloat());
-  EXPECT_EQ(
-      0x1.5bf0aap1f,
-      llvm::exp(APFloat(1.0f), APFloat::rmTowardPositive).convertToFloat());
-  EXPECT_EQ(
-      0x1.5bf0a8p1f,
-      llvm::exp(APFloat(1.0f), APFloat::rmTowardNegative).convertToFloat());
-  EXPECT_EQ(0x1.5bf0a8p1f,
-            llvm::exp(APFloat(1.0f), APFloat::rmTowardZero).convertToFloat());
-  // exp(float max)
-  EXPECT_EQ(std::numeric_limits<float>::infinity(),
-            llvm::exp(APFloat::getLargest(APFloat::IEEEsingle(), false),
-                      APFloat::rmNearestTiesToEven)
-                .convertToFloat());
-  EXPECT_EQ(std::numeric_limits<float>::infinity(),
-            llvm::exp(APFloat::getLargest(APFloat::IEEEsingle(), false),
-                      APFloat::rmTowardPositive)
-                .convertToFloat());
-  EXPECT_EQ(std::numeric_limits<float>::max(),
-            llvm::exp(APFloat::getLargest(APFloat::IEEEsingle(), false),
-                      APFloat::rmTowardNegative)
-                .convertToFloat());
-  EXPECT_EQ(std::numeric_limits<float>::max(),
-            llvm::exp(APFloat::getLargest(APFloat::IEEEsingle(), false),
-                      APFloat::rmTowardZero)
-                .convertToFloat());
-  // exp(min_denormal)
-  EXPECT_EQ(1.0f, llvm::exp(APFloat::getSmallest(APFloat::IEEEsingle(), false),
-                            APFloat::rmNearestTiesToEven)
-                      .convertToFloat());
-  EXPECT_EQ(0x1.000002p0f,
-            llvm::exp(APFloat::getSmallest(APFloat::IEEEsingle(), false),
-                      APFloat::rmTowardPositive)
-                .convertToFloat());
-  EXPECT_EQ(1.0f, llvm::exp(APFloat::getSmallest(APFloat::IEEEsingle(), false),
-                            APFloat::rmTowardNegative)
-                      .convertToFloat());
-  EXPECT_EQ(1.0f, llvm::exp(APFloat::getSmallest(APFloat::IEEEsingle(), false),
-                            APFloat::rmTowardZero)
-                      .convertToFloat());
-  // Default rounding mode.
-  // exp(-1)
-  EXPECT_EQ(0x1.78b564p-2f, llvm::exp(APFloat(-1.0f)).convertToFloat());
-  EXPECT_EQ(
-      0x1.78b564p-2f,
-      llvm::exp(APFloat(-1.0f), APFloat::rmTowardPositive).convertToFloat());
-  EXPECT_EQ(
-      0x1.78b562p-2f,
-      llvm::exp(APFloat(-1.0f), APFloat::rmTowardNegative).convertToFloat());
-  EXPECT_EQ(0x1.78b562p-2f,
-            llvm::exp(APFloat(-1.0f), APFloat::rmTowardZero).convertToFloat());
-}
-
 } // namespace