Merge pull request #4346 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

CMakeLists.txt

@@ -742,10 +742,14 @@ else()
     endif()
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
     set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc")
+    set(SWIFT_HOST_VARIANT_ARCH_default "powerpc")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64le")
     set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64le")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "s390x")
     set(SWIFT_HOST_VARIANT_ARCH_default "s390x")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv5|armv5te")
+    set(SWIFT_HOST_VARIANT_ARCH_default "armv5")
   # FIXME: Only matches v6l/v7l - by far the most common variants
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv6")

benchmark/CMakeLists.txt

@@ -196,6 +196,7 @@ set(SWIFT_BENCH_MODULES
     single-source/WordCount
     single-source/XorLoop
     cxx-source/CreateObjects
+    cxx-source/ReadAccessor
 )
 
 set(SWIFT_MULTISOURCE_SWIFT_BENCHES

benchmark/cxx-source/ReadAccessor.swift

@@ -0,0 +1,52 @@
+// Subscripts.swift - Very brief description
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+// -----------------------------------------------------------------------------
+///
+/// This is a simple test that reads a non trivial C++ struct using an imported
+/// subscript thousands of times.
+///
+// -----------------------------------------------------------------------------
+
+import TestsUtils
+import CxxSubscripts
+
+var vec : TwoDimensionalVector?
+
+public let benchmarks = [
+  BenchmarkInfo(
+    name: "ReadAccessor",
+    runFunction: run_ReadAccessor,
+    tags: [.validation, .bridging],
+    setUpFunction: {
+        vec = initVector()
+    })
+]
+
+@inline(never)
+public func run_ReadAccessor(_ N: Int) {
+  for i in 0...N {
+    for j in 0..<100 {
+#if os(Linux)
+      let row = vec![UInt(j)];
+#else
+      let row = vec![j];
+#endif
+      for k in 0..<1_000 {
+#if os(Linux)
+        let element = row[UInt(k)];
+#else
+        let element = row[k];
+#endif
+        blackHole(element)
+      }
+    }
+  }
+}

benchmark/utils/CxxTests/Subscripts.h

@@ -0,0 +1,10 @@
+#ifndef BENCHMARK_SUBSCRIPTS_H
+#define BENCHMARK_SUBSCRIPTS_H
+#include <vector>
+
+using TwoDimensionalVector = std::vector<std::vector<int>>;
+
+inline TwoDimensionalVector initVector() { return {100, std::vector<int>{1000, 0}}; }
+
+#endif
+

benchmark/utils/CxxTests/module.modulemap

@@ -2,3 +2,8 @@ module CxxCreateObjects {
   header "CreateObjects.h"
   requires cplusplus
 }
+
+module CxxSubscripts {
+  header "Subscripts.h"
+  requires cplusplus
+}

benchmark/utils/main.swift

@@ -152,6 +152,7 @@ import RangeAssignment
 import RangeIteration
 import RangeOverlaps
 import RangeReplaceableCollectionPlusDefault
+import ReadAccessor
 import RecursiveOwnedParameter
 import ReduceInto
 import RemoveWhere
@@ -332,6 +333,7 @@ register(RangeAssignment.benchmarks)
 register(RangeIteration.benchmarks)
 register(RangeOverlaps.benchmarks)
 register(RangeReplaceableCollectionPlusDefault.benchmarks)
+register(ReadAccessor.benchmarks)
 register(RecursiveOwnedParameter.benchmarks)
 register(ReduceInto.benchmarks)
 register(RemoveWhere.benchmarks)

cmake/modules/AddSwift.cmake

@@ -344,7 +344,7 @@ function(_add_host_variant_link_flags target)
     target_link_libraries(${target} PRIVATE
       pthread
       dl)
-    if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv6|armv7|i686")
+    if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv5|armv6|armv7|i686")
       target_link_libraries(${target} PRIVATE atomic)
     endif()
   elseif(SWIFT_HOST_VARIANT_SDK STREQUAL FREEBSD)

cmake/modules/AddSwiftUnittests.cmake

@@ -37,7 +37,7 @@ function(add_swift_unittest test_dirname)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
       target_compile_options(${test_dirname} PRIVATE
         -march=core2)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv6|armv7|i686")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv5|armv6|armv7|i686")
       set_property(TARGET "${test_dirname}" APPEND PROPERTY LINK_LIBRARIES
         "atomic")
     endif()

cmake/modules/SwiftConfigureSDK.cmake

@@ -324,9 +324,11 @@ macro(configure_sdk_unix name architectures)
       endif()
 
       if("${prefix}" STREQUAL "LINUX")
-        if(arch MATCHES "(armv6|armv7)")
+        if(arch MATCHES "(armv5)")
+          set(SWIFT_SDK_LINUX_ARCH_${arch}_TRIPLE "${arch}-unknown-linux-gnueabi")
+        elseif(arch MATCHES "(armv6|armv7)")
           set(SWIFT_SDK_LINUX_ARCH_${arch}_TRIPLE "${arch}-unknown-linux-gnueabihf")
-        elseif(arch MATCHES "(aarch64|i686|powerpc64|powerpc64le|s390x|x86_64)")
+        elseif(arch MATCHES "(aarch64|i686|powerpc|powerpc64|powerpc64le|s390x|x86_64)")
           set(SWIFT_SDK_LINUX_ARCH_${arch}_TRIPLE "${arch}-unknown-linux-gnu")
         else()
           message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}")

cmake/modules/SwiftSetIfArchBitness.cmake

@@ -9,12 +9,14 @@ function(set_if_arch_bitness var_name)
   if("${SIA_ARCH}" STREQUAL "i386" OR
      "${SIA_ARCH}" STREQUAL "i686" OR
      "${SIA_ARCH}" STREQUAL "x86" OR
+     "${SIA_ARCH}" STREQUAL "armv5" OR
      "${SIA_ARCH}" STREQUAL "armv6" OR
      "${SIA_ARCH}" STREQUAL "armv7" OR
      "${SIA_ARCH}" STREQUAL "armv7k" OR
      "${SIA_ARCH}" STREQUAL "arm64_32" OR
      "${SIA_ARCH}" STREQUAL "armv7s" OR
-     "${SIA_ARCH}" STREQUAL "wasm32")
+     "${SIA_ARCH}" STREQUAL "wasm32" OR
+     "${SIA_ARCH}" STREQUAL "powerpc")
     set("${var_name}" "${SIA_CASE_32_BIT}" PARENT_SCOPE)
   elseif("${SIA_ARCH}" STREQUAL "x86_64" OR
          "${SIA_ARCH}" STREQUAL "amd64" OR