Revert "merge main into amd-staging (llvm#684)"

This reverts commit 6185b02.

Author: ronlieb

libc/include/__llvm-libc-common.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LLVM_LIBC_COMMON_H
-#define _LLVM_LIBC_COMMON_H
+#ifndef LLVM_LIBC_COMMON_H
+#define LLVM_LIBC_COMMON_H
 
 #define __LLVM_LIBC__ 1
 
@@ -87,4 +87,4 @@
 
 #endif // __cplusplus
 
-#endif // _LLVM_LIBC_COMMON_H
+#endif // LLVM_LIBC_COMMON_H

libc/include/malloc.yaml

@@ -9,23 +9,10 @@ macros:
   - macro_name: M_PURGE_ALL
     macro_header: malloc-macros.h
 functions:
-  - name: malloc_usable_size
-    standards:
-      - gnu
-    return_type: size_t
-    arguments:
-      - type: void *
   - name: mallopt
     standards:
       - gnu
     return_type: int
     arguments:
       - type: int
       - type: int
-  - name: pvalloc
-    standards:
-      - bsd
-      - gnu
-    return_type: void *
-    arguments:
-      - type: size_t

libc/include/stdlib-malloc.yaml

@@ -1,10 +1,4 @@
 # This file has declarations that appear both in <stdlib.h> and in <malloc.h>.
-# These include the subset of GNU extensions that Scudo supports.
-#
-# Note: glibc's <stdlib.h> and <malloc.h> both also have `reallocarray`,
-# which Scudo does not support and is omitted here.  (Each of those glibc
-# headers also has related functions the other lacks, but those should be
-# covered separately in stdlib.yaml and malloc.yaml instead.)
 
 functions:
   - name: aligned_alloc
@@ -33,31 +27,18 @@ functions:
     return_type: void *
     arguments:
       - type: size_t
-  - name: memalign
-    standards:
-      - gnu
-    return_type: void *
-    arguments:
-      - type: size_t
-      - type: size_t
   - name: realloc
     standards:
       - stdc
     return_type: void *
     arguments:
       - type: void *
       - type: size_t
+
 # Note: glibc's <stdlib.h> and <malloc.h> both have these, which are
 # currently missing here:
 #  - name: reallocarray
 #  - name: memalign
 #  - name: valloc
 # Each of those glibc headers also has related functions the other lacks.
 # Only the common subset is mentioned here for future consideration.
-  - name: valloc
-    standards:
-      - bsd
-      - gnu
-    return_type: void *
-    arguments:
-      - type: size_t

libc/include/stdlib.yaml

@@ -127,14 +127,6 @@ functions:
     arguments:
       - type: long long
       - type: long long
-  - name: posix_memalign
-    standards:
-      - posix
-    return_type: int
-    arguments:
-      - type: void **
-      - type: size_t
-      - type: size_t
   - name: qsort
     standards:
       - stdc

libc/utils/hdrgen/header.py

@@ -124,7 +124,7 @@ def includes(self):
         }
 
     def header_guard(self):
-        return "_LLVM_LIBC_" + "_".join(
+        return "LLVM_LIBC_" + "_".join(
             word.upper() for word in NONIDENTIFIER.split(self.name) if word
         )
 

libc/utils/hdrgen/tests/expected_output/subdir/test.h

@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LLVM_LIBC_SUBDIR_TEST_H
-#define _LLVM_LIBC_SUBDIR_TEST_H
+#ifndef LLVM_LIBC_SUBDIR_TEST_H
+#define LLVM_LIBC_SUBDIR_TEST_H
 
 #include "../__llvm-libc-common.h"
 #include "../llvm-libc-types/type_a.h"
@@ -23,4 +23,4 @@ int *ptrfunc(void) __NOEXCEPT;
 
 __END_C_DECLS
 
-#endif // _LLVM_LIBC_SUBDIR_TEST_H
+#endif // LLVM_LIBC_SUBDIR_TEST_H

libcxx/src/iostream.cpp

@@ -18,8 +18,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class StreamT, class BufferT>
 union stream_data {
-  constexpr stream_data() {}
-  constexpr ~stream_data() {}
+  stream_data() {}
+  ~stream_data() {}
   struct {
     // The stream has to be the first element, since that's referenced by the stream declarations in <iostream>
     StreamT stream;
@@ -38,19 +38,13 @@ union stream_data {
 #define CHAR_MANGLING_wchar_t "_W"
 #define CHAR_MANGLING(CharT) CHAR_MANGLING_##CharT
 
-#ifdef _LIBCPP_COMPILER_CLANG_BASED
-#  define STRING_DATA_CONSTINIT constinit
-#else
-#  define STRING_DATA_CONSTINIT
-#endif
-
 #ifdef _LIBCPP_ABI_MICROSOFT
 #  define STREAM(StreamT, BufferT, CharT, var)                                                                         \
-    STRING_DATA_CONSTINIT stream_data<StreamT<CharT>, BufferT<CharT>> var __asm__(                                     \
+    stream_data<StreamT<CharT>, BufferT<CharT>> var __asm__(                                                           \
         "?" #var "@" ABI_NAMESPACE_STR "@std@@3V?$" #StreamT                                                           \
         "@" CHAR_MANGLING(CharT) "U?$char_traits@" CHAR_MANGLING(CharT) "@" ABI_NAMESPACE_STR "@std@@@12@A")
 #else
-#  define STREAM(StreamT, BufferT, CharT, var) STRING_DATA_CONSTINIT stream_data<StreamT<CharT>, BufferT<CharT>> var
+#  define STREAM(StreamT, BufferT, CharT, var) stream_data<StreamT<CharT>, BufferT<CharT>> var
 #endif
 
 // These definitions and the declarations in <iostream> technically cause ODR violations, since they have different

libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_Init/ios_Init.global.pass.cpp

@@ -117,7 +117,6 @@ class DGNode {
   virtual ~DGNode();
   /// \Returns the number of unscheduled successors.
   unsigned getNumUnscheduledSuccs() const { return UnscheduledSuccs; }
-  // TODO: Make this private?
   void decrUnscheduledSuccs() {
     assert(UnscheduledSuccs > 0 && "Counting error!");
     --UnscheduledSuccs;
@@ -215,8 +214,6 @@ class MemDGNode final : public DGNode {
   MemDGNode *NextMemN = nullptr;
   /// Memory predecessors.
   DenseSet<MemDGNode *> MemPreds;
-  /// Memory successors.
-  DenseSet<MemDGNode *> MemSuccs;
   friend class PredIterator; // For MemPreds.
   /// Creates both edges: this<->N.
   void setNextNode(MemDGNode *N) {
@@ -268,20 +265,10 @@ class MemDGNode final : public DGNode {
     [[maybe_unused]] auto Inserted = MemPreds.insert(PredN).second;
     assert(Inserted && "PredN already exists!");
     assert(PredN != this && "Trying to add a dependency to self!");
-    PredN->MemSuccs.insert(this);
     if (!Scheduled) {
       ++PredN->UnscheduledSuccs;
     }
   }
-  /// Removes the memory dependency PredN->this. This also updates the
-  /// UnscheduledSuccs counter of PredN if this node has not been scheduled.
-  void removeMemPred(MemDGNode *PredN) {
-    MemPreds.erase(PredN);
-    PredN->MemSuccs.erase(this);
-    if (!Scheduled) {
-      PredN->decrUnscheduledSuccs();
-    }
-  }
   /// \Returns true if there is a memory dependency N->this.
   bool hasMemPred(DGNode *N) const {
     if (auto *MN = dyn_cast<MemDGNode>(N))
@@ -292,10 +279,6 @@ class MemDGNode final : public DGNode {
   iterator_range<DenseSet<MemDGNode *>::const_iterator> memPreds() const {
     return make_range(MemPreds.begin(), MemPreds.end());
   }
-  /// \Returns all memory dependency successors.
-  iterator_range<DenseSet<MemDGNode *>::const_iterator> memSuccs() const {
-    return make_range(MemSuccs.begin(), MemSuccs.end());
-  }
 #ifndef NDEBUG
   virtual void print(raw_ostream &OS, bool PrintDeps = true) const override;
 #endif // NDEBUG

llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/DependencyGraph.h

@@ -250,9 +250,6 @@ define void @foo(ptr %ptr, i8 %v0, i8 %v1) {
   EXPECT_THAT(N1->memPreds(), testing::ElementsAre(N0));
   EXPECT_TRUE(N2->preds(DAG).empty());
 
-  // Check memSuccs().
-  EXPECT_THAT(N0->memSuccs(), testing::ElementsAre(N1));
-
   // Check UnscheduledSuccs.
   EXPECT_EQ(N0->getNumUnscheduledSuccs(), 1u); // N1
   EXPECT_EQ(N1->getNumUnscheduledSuccs(), 0u);
@@ -271,41 +268,6 @@ define void @foo(ptr %ptr, i8 %v0, i8 %v1) {
   EXPECT_TRUE(N0->scheduled());
 }
 
-TEST_F(DependencyGraphTest, AddRemoveMemPred) {
-  parseIR(C, R"IR(
-define void @foo(ptr %ptr, i8 %v0, i8 %v1) {
-  store i8 %v0, ptr %ptr
-  store i8 %v1, ptr %ptr
-  ret void
-}
-)IR");
-  llvm::Function *LLVMF = &*M->getFunction("foo");
-  sandboxir::Context Ctx(C);
-  auto *F = Ctx.createFunction(LLVMF);
-  auto *BB = &*F->begin();
-  auto It = BB->begin();
-  auto *S0 = cast<sandboxir::StoreInst>(&*It++);
-  auto *S1 = cast<sandboxir::StoreInst>(&*It++);
-
-  sandboxir::DependencyGraph DAG(getAA(*LLVMF), Ctx);
-  DAG.extend({&*BB->begin(), BB->getTerminator()});
-  auto *N0 = cast<sandboxir::MemDGNode>(DAG.getNode(S0));
-  auto *N1 = cast<sandboxir::MemDGNode>(DAG.getNode(S1));
-
-  // Check removeMemPred().
-  EXPECT_FALSE(N0->memSuccs().empty());
-  EXPECT_EQ(N0->getNumUnscheduledSuccs(), 1u);
-  N1->removeMemPred(N0);
-  EXPECT_TRUE(N1->memPreds().empty());
-  EXPECT_EQ(N0->getNumUnscheduledSuccs(), 0u);
-
-  // Check addMemPred().
-  N1->addMemPred(N0);
-  EXPECT_THAT(N1->memPreds(), testing::UnorderedElementsAre(N0));
-  EXPECT_THAT(N0->memSuccs(), testing::UnorderedElementsAre(N1));
-  EXPECT_THAT(N0->getNumUnscheduledSuccs(), 1u);
-}
-
 TEST_F(DependencyGraphTest, Preds) {
   parseIR(C, R"IR(
 declare ptr @bar(i8)
@@ -571,7 +533,7 @@ define void @foo(ptr noalias %ptr0, ptr noalias %ptr1) {
   EXPECT_TRUE(RetN->preds(DAG).empty());
 }
 
-TEST_F(DependencyGraphTest, VolatileStores) {
+TEST_F(DependencyGraphTest, VolatileSotres) {
   parseIR(C, R"IR(
 define void @foo(ptr noalias %ptr0, ptr noalias %ptr1, i8 %v) {
   store volatile i8 %v, ptr %ptr0