[cxx-interop] Add infrastructure to build and run tests on multiple targets. #36082

zoecarver · 2021-02-22T04:20:15Z

Updates the build script, update checkout script, and lit config to support cross-compiling uswift to allow running tests on multiple targets locally. Introduces the %cxx-all-targets to run tests on several targets. Currently, this is only used on the C++ interop IRGen tests, but another lit substitution could be added for other tests.

Here are the targets we currently cross-compile to:

arm64-apple-macosx10.9
x86_64-apple-macosx10.9
armv7-unknown-linux-androideabi
x86_64-unknown-windows-msvc

Main changes:

Unconditionally builds LLD.
Adds dependency on uswift.

Link to the forum post.

zoecarver · 2021-02-22T04:22:17Z

@swift-ci please test.

zoecarver · 2021-02-22T04:22:47Z

@swift-ci please test windows.

zoecarver · 2021-02-22T04:23:01Z

@swift-ci please test Windows platform.

zoecarver · 2021-02-22T04:23:09Z

@swift-ci please test Windows.

swift-ci · 2021-02-22T04:35:12Z

Build failed
Swift Test OS X Platform
Git Sha - b9265e79ee31810359229bfda9f20db5c303650c

swift-ci · 2021-02-22T05:07:44Z

Build failed
Swift Test Linux Platform
Git Sha - b9265e79ee31810359229bfda9f20db5c303650c

zoecarver · 2021-02-22T18:34:17Z

@swift-ci please clean smoke test macOS.

zoecarver · 2021-02-24T19:29:46Z

@swift-ci please clean smoke test macOS.

zoecarver · 2021-02-24T21:45:48Z

test/Interop/Cxx/value-witness-table/copy-constructors-irgen.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
+// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir | %FileCheck %s)


Note to self: revert this change; it requires macos.

zoecarver · 2021-09-21T23:18:21Z

Once compnerd/uswift/pull/19 lands I should be able to run the bots here.

zoecarver · 2021-09-24T16:26:11Z

@swift-ci please smoke test.

zoecarver · 2021-09-24T17:03:37Z

@swift-ci please test Windows.

zoecarver · 2021-09-24T17:03:50Z

@swift-ci please test windows

zoecarver · 2021-09-24T17:05:42Z

@shahmishal no pressure, but would you like to review this?

@gottesmm @compnerd friendly ping.

zoecarver · 2021-11-29T18:01:16Z

@compnerd would you mind reviewing this patch? I'm about to push a rebased version but the logic is all the same.

I know you want us to support Windows better, specifically around IRGen. I think this patch will help that effort a lot. If we can test all platforms on any device, we will inevitably support all platforms better.

Edit: when I say "push a rebased version" I mean "push a rebased version to the PR for review." Sorry for not being more clear.

zoecarver · 2021-11-29T21:04:35Z

@swift-ci please smoke test.

compnerd · 2021-11-30T05:36:46Z

utils/build-script-impl

+                )
+
+                # Build uswift for each target.
+                for (( i=1; i<${uswift_targets_length}+1; i+=2 ));


Why? Why not do:

for target in ${uswift_targets[@]} ; do done

compnerd · 2021-11-30T05:37:33Z

utils/build-script-impl

+                    else
+                        all_cmake_options=(
+                            "${all_cmake_options[@]}"
+                            -D CMAKE_Swift_FLAGS="-Xfrontend -disable-legacy-type-info"


Why not do this unconditionally?

compnerd · 2021-11-30T05:40:55Z

utils/swift_build_support/swift_build_support/products/uswift.py

+
+        Whether this product is produced by build-script-impl.
+        """
+        return True


We really should not add a new build-script-impl product but rather move it here.

compnerd · 2021-11-30T05:41:25Z

utils/update_checkout/update-checkout-config.json

@@ -11,15 +11,15 @@
        "swift-argument-parser": {
            "remote": { "id": "apple/swift-argument-parser" } },
        "swift-atomics": {
-            "remote": { "id": "apple/swift-atomics" } },       
+            "remote": { "id": "apple/swift-atomics" } },


Could you split out and pre-apply the whitespace changes please?

compnerd · 2021-11-30T05:43:44Z

test/lit.cfg

@@ -2134,6 +2134,16 @@ if platform.system() != 'Darwin' or swift_test_mode == 'optimize_none_with_impli
 #

 config.substitutions.append(('%target-clangxx', '%s -std=c++11' % config.target_clang))
+config.substitutions.append(('%cxx-all-targets\(([^)]+)\)',


I think that moving this to the next commit is better. Additionally, I'm not sure how I feel about this - this is a really really really complex way to do this. We already push lit well beyond what it should be used as, and this is particularly horrendous. Can we use a different approach for this? I think that adding the subdirectory as a multiple test suites in a lit.local.cfg might be better.

…e targets. Updates the build script, update checkout script, and lit config to support cross compiling uswift, then using uswift to cross compile and run tests on multiple targets locally.

…titution. This patch updates most of the Interop/Cxx IRGen tests to use the %cxx-all-targets lit substituion which will run these tests on several targets. This commit only changes tests which didn't require further modification to pass, there are still 11 tests which could use this subsitution but would require some sort of change.

zoecarver · 2022-02-18T23:49:06Z

@swift-ci please test.

zoecarver added the c++ interop Feature: Interoperability with C++ label Feb 22, 2021

zoecarver requested review from compnerd and gottesmm February 22, 2021 04:20

zoecarver force-pushed the cxx/cross-compile-stdlib branch from b9265e7 to 574004e Compare February 22, 2021 05:38

zoecarver mentioned this pull request Feb 22, 2021

Bump CMake version to 3.19.6. #36094

Merged

zoecarver force-pushed the cxx/cross-compile-stdlib branch from 574004e to 0c2f36e Compare February 24, 2021 19:25

zoecarver commented Feb 24, 2021

View reviewed changes

zoecarver mentioned this pull request Feb 26, 2021

C++ Interop: import call operators #36075

Merged

zoecarver force-pushed the cxx/cross-compile-stdlib branch 3 times, most recently from a55d466 to 73473c7 Compare September 21, 2021 23:13

zoecarver requested a review from shahmishal September 23, 2021 16:27

zoecarver mentioned this pull request Oct 6, 2021

[cxx-interop] Allow importing templated functions when template args do not appear in function signature #39535

Merged

zoecarver force-pushed the cxx/cross-compile-stdlib branch from 73473c7 to 69b5ba5 Compare November 29, 2021 20:30

compnerd requested changes Nov 30, 2021

View reviewed changes

[build-script][tests] Add infrastucture to build/run tests on multipl…

957d8cc

…e targets. Updates the build script, update checkout script, and lit config to support cross compiling uswift, then using uswift to cross compile and run tests on multiple targets locally.

zoecarver force-pushed the cxx/cross-compile-stdlib branch from 69b5ba5 to 6779745 Compare February 18, 2022 23:46

zoecarver force-pushed the cxx/cross-compile-stdlib branch from 6779745 to c18da8b Compare February 18, 2022 23:48

		@@ -1,4 +1,4 @@
		// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir \| %FileCheck %s
		// RUN: %cxx-all-targets(-I %S/Inputs %s -emit-ir \| %FileCheck %s)

[cxx-interop] Add infrastructure to build and run tests on multiple targets. #36082

Are you sure you want to change the base?

[cxx-interop] Add infrastructure to build and run tests on multiple targets. #36082

Uh oh!

Conversation

zoecarver commented Feb 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zoecarver commented Feb 22, 2021

Uh oh!

zoecarver commented Feb 22, 2021

Uh oh!

zoecarver commented Feb 22, 2021

Uh oh!

zoecarver commented Feb 22, 2021

Uh oh!

swift-ci commented Feb 22, 2021

Uh oh!

swift-ci commented Feb 22, 2021

Uh oh!

zoecarver commented Feb 22, 2021

Uh oh!

zoecarver commented Feb 24, 2021

Uh oh!

zoecarver Feb 24, 2021

Choose a reason for hiding this comment

Uh oh!

zoecarver commented Sep 21, 2021

Uh oh!

zoecarver commented Sep 24, 2021

Uh oh!

zoecarver commented Sep 24, 2021

Uh oh!

zoecarver commented Sep 24, 2021

Uh oh!

zoecarver commented Sep 24, 2021

Uh oh!

zoecarver commented Nov 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zoecarver commented Nov 29, 2021

Uh oh!

compnerd Nov 30, 2021

Choose a reason for hiding this comment

Uh oh!

compnerd Nov 30, 2021

Choose a reason for hiding this comment

Uh oh!

compnerd Nov 30, 2021

Choose a reason for hiding this comment

Uh oh!

compnerd Nov 30, 2021

Choose a reason for hiding this comment

Uh oh!

compnerd Nov 30, 2021

Choose a reason for hiding this comment

Uh oh!

zoecarver commented Feb 18, 2022

Uh oh!

Uh oh!

zoecarver commented Feb 22, 2021 •

edited

Loading

zoecarver commented Nov 29, 2021 •

edited

Loading