[browser] build more subsets + runtime interp test

eng/Subsets.props

@@ -54,7 +54,7 @@
 
     <!-- Determine if we support running the .NET SDK on the target platform -->
     <_SdkToolsSupportedOS Condition="'$(TargetsMobile)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">true</_SdkToolsSupportedOS>
-    <_SdkToolsSupportedArch Condition="'$(TargetArchitecture)' != 'armel'">true</_SdkToolsSupportedArch>
+    <_SdkToolsSupportedArch Condition="'$(TargetArchitecture)' != 'armel' and '$(TargetsWasm)' != 'true'">true</_SdkToolsSupportedArch>
     <SdkToolsSupported Condition="'$(_SdkToolsSupportedOS)' == 'true' and '$(_SdkToolsSupportedArch)' == 'true'">true</SdkToolsSupported>
 
     <_UseNativeAotForComponentsCrossOS Condition="'$(CrossBuild)' == 'true' and '$(_hostArchitecture)' == '$(_targetArchitecture)' and '$(_hostOS)' != 'windows'">true</_UseNativeAotForComponentsCrossOS>
@@ -109,7 +109,8 @@
     <DefaultCoreClrSubsets>clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools+host.native</DefaultCoreClrSubsets>
     <DefaultCoreClrSubsets Condition="'$(TargetRid)' == 'linux-armel'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools</DefaultCoreClrSubsets>
     <DefaultCoreClrSubsets Condition="'$(TargetsAndroid)' == 'true'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools</DefaultCoreClrSubsets>
-    <DefaultCoreClrSubsets Condition="'$(TargetsBrowser)' == 'true'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.crossarchtools+host.native</DefaultCoreClrSubsets>
+    <!-- WASM-TODO: host.native -->
+    <DefaultCoreClrSubsets Condition="'$(TargetsBrowser)' == 'true'">mono.emsdk+clr.native+clr.corelib+clr.tools+clr.packages+clr.crossarchtools</DefaultCoreClrSubsets>
     <!-- Even on platforms that do not support the CoreCLR runtime, we still want to build ilasm/ildasm. -->
     <DefaultCoreClrSubsets Condition="'$(RuntimeFlavor)' != 'CoreCLR'">clr.iltools+clr.packages</DefaultCoreClrSubsets>
 
@@ -364,7 +365,7 @@
     The cross tools are used as part of the build process with the downloaded build tools, so we need to build them for the host architecture and build them as unsanitized binaries.
     -->
   <PropertyGroup>
-    <_BuildAnyCrossArch Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '') and '$(TargetArchitecture)' != 'wasm'">true</_BuildAnyCrossArch>
+    <_BuildAnyCrossArch Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '') and '$(TargetsWasm)' != 'true'">true</_BuildAnyCrossArch>
     <_BuildCrossComponents Condition="$(_subset.Contains('+clr.crossarchtools+'))">true</_BuildCrossComponents>
     <_BuildCrossComponents Condition="'$(ClrRuntimeBuildSubsets)' != '' and ('$(PrimaryRuntimeFlavor)' == 'CoreCLR' or '$(TargetsMobile)' == 'true')">true</_BuildCrossComponents>
     <_CrossBitwidthBuild Condition="'$(BuildArchitecture)' == 'x64' and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm')">true</_CrossBitwidthBuild>

eng/liveBuilds.targets

@@ -215,27 +215,31 @@
         $(LibrariesNativeArtifactsPath)*.dex;
         $(LibrariesNativeArtifactsPath)*.jar;"
         IsNative="true" />
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <!-- WASM-TODO build this also as part of coreCLR host.native -->
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="
+        $(LibrariesNativeArtifactsPath)dotnet.d.ts;
         $(LibrariesNativeArtifactsPath)dotnet.js;
         $(LibrariesNativeArtifactsPath)dotnet.js.map;
-        $(LibrariesNativeArtifactsPath)dotnet.native.js;
         $(LibrariesNativeArtifactsPath)dotnet.runtime.js;
         $(LibrariesNativeArtifactsPath)dotnet.runtime.js.map;
+        $(LibrariesNativeArtifactsPath)*.dat;"
+        IsNative="true" />
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
+                             Include="
         $(LibrariesNativeArtifactsPath)dotnet.diagnostics.js;
-        $(LibrariesNativeArtifactsPath)dotnet.diagnostics.js.map;
-        $(LibrariesNativeArtifactsPath)dotnet.d.ts;
-        $(LibrariesNativeArtifactsPath)package.json;
+        $(LibrariesNativeArtifactsPath)dotnet.native.js;
         $(LibrariesNativeArtifactsPath)dotnet.native.wasm;
-        $(LibrariesNativeArtifactsPath)dotnet.native.js.symbols;
-        $(LibrariesNativeArtifactsPath)*.dat;"
+        $(LibrariesNativeArtifactsPath)package.json;
+        $(LibrariesNativeArtifactsPath)dotnet.diagnostics.js.map;
+        $(LibrariesNativeArtifactsPath)dotnet.native.js.symbols;"
         IsNative="true" />
       <!-- for threaded wasm -->
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and Exists('$(LibrariesNativeArtifactsPath)dotnet.native.worker.mjs')"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono' and Exists('$(LibrariesNativeArtifactsPath)dotnet.native.worker.mjs')"
                              Include="
         $(LibrariesNativeArtifactsPath)dotnet.native.worker.mjs"
         IsNative="true" />
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="
         $(LibrariesNativeArtifactsPath)src\*.c;
         $(LibrariesNativeArtifactsPath)src\*.js;
@@ -244,12 +248,12 @@
         $(LibrariesNativeArtifactsPath)src\wasm-props.json;"
         NativeSubDirectory="src"
         IsNative="true" />
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="$(LibrariesNativeArtifactsPath)src\es6\*.js"
                              NativeSubDirectory="src\es6"
                              IsNative="true" />
 
-      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser'"
+      <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'Mono'"
                              Include="
         $(LibrariesNativeArtifactsPath)include\wasm\*.h;"
         NativeSubDirectory="include\wasm"

eng/pipelines/runtime.yml

@@ -105,14 +105,23 @@ extends:
       - template: /eng/pipelines/common/platform-matrix.yml
         parameters:
           jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+          buildConfig: Debug
           platforms:
           - browser_wasm
           - browser_wasm_win
           jobParameters:
             nameSuffix: AllSubsets_CoreCLR
-            buildArgs: -s clr.runtime+libs -rc Release -c Release -lc $(_BuildConfig)
+            buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
             timeoutInMinutes: 120
+            postBuildSteps:
+              - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml
+                parameters:
+                  testBuildArgs: test JIT/interpreter/Interpreter.csproj
+            extraVariablesTemplates:
+              - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
+                parameters:
+                  testGroup: innerloop
+                  liveLibrariesBuildConfig: Release
             condition: >-
               or(
                 eq(variables['wasmDarcDependenciesChanged'], true),

src/coreclr/CMakeLists.txt

@@ -41,7 +41,6 @@ if (CLR_CMAKE_TARGET_ARCH_WASM)
       -msimd128)
     add_link_options(
       -fwasm-exceptions 
-      -msimd128
       )
 endif()
 

src/coreclr/hosts/CMakeLists.txt

@@ -4,8 +4,4 @@ if(CLR_CMAKE_HOST_WIN32)
   add_subdirectory(coreshim)
 endif(CLR_CMAKE_HOST_WIN32)
 
-if (CLR_CMAKE_TARGET_ARCH_WASM)
-  add_subdirectory(corewasmrun)
-endif()
-
 add_subdirectory(corerun)

src/coreclr/hosts/corerun/CMakeLists.txt

@@ -69,7 +69,6 @@ else(CLR_CMAKE_HOST_WIN32)
                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
             target_link_options(corerun PRIVATE
                 -fwasm-exceptions
-                -msimd128
                 -sEXIT_RUNTIME=1
                 -sINITIAL_MEMORY=134217728
                 -sENVIRONMENT=node,shell

src/coreclr/hosts/corewasmrun/CMakeLists.txt

@@ -33,7 +33,6 @@ set_target_properties(corewasmrun PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 target_link_options(corewasmrun PRIVATE
   -fwasm-exceptions
-  -msimd128
   -sEXIT_RUNTIME=1
   -sINITIAL_MEMORY=134217728
   -sSTACK_SIZE=5MB

src/coreclr/pal/CMakeLists.txt

@@ -15,7 +15,6 @@ else()
         )
     add_link_options(
         -fwasm-exceptions 
-        -msimd128
         )
 endif()
 

src/coreclr/tools/aot/ILCompiler/ILCompiler.props

@@ -67,6 +67,7 @@
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="PreserveNewest"
       Link="%(FileName)%(Extension)"
+      Condition="'$(TargetsWasm)' != 'true'"
       />
 
     <Content Include="$(CoreCLRArtifactsPath)/$(_LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)"

src/coreclr/tools/aot/crossgen2/crossgen2.props

@@ -55,6 +55,7 @@
       CopyToPublishDirectory="PreserveNewest"
       ExcludeFromSingleFile="$(PublishSingleFile)"
       Link="%(FileName)%(Extension)"
+      Condition="'$(TargetsWasm)' != 'true'"
       />
 
     <Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(_LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)"

src/mono/llvm/llvm-init.proj

@@ -13,7 +13,7 @@
     <MonoLLVMToolsVersion Condition="'$(MonoLLVMHostOS)' == 'linux-musl'">$(runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)</MonoLLVMToolsVersion>
     <MonoLLVMToolsVersion Condition="'$(MonoLLVMHostOS)' == 'win'">$(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)</MonoLLVMToolsVersion>
     <MonoLLVMToolsVersion Condition="'$(MonoLLVMHostOS)' == 'osx'">$(runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)</MonoLLVMToolsVersion>
-    <MonoLLVMSDKDebugSuffix Condition="'$(MonoLLVMHostOS)' == 'win' and '$(Configuration)' == 'Debug' and '$(ContinuousIntegrationBuild)' == 'true'" >.Debug</MonoLLVMSDKDebugSuffix>
+    <MonoLLVMSDKDebugSuffix Condition="'$(MonoLLVMHostOS)' == 'win' and '$(Configuration)' == 'Debug'" >.Debug</MonoLLVMSDKDebugSuffix>
   </PropertyGroup>
 
   <ItemGroup>
@@ -74,9 +74,9 @@
                                    Version="$(MonoLLVMToolsVersion)"
                                    PackageArch="$(BuildArchitecture)"/>
   </ItemGroup>
-  <ItemGroup Condition="@(_PackageReferenceDeduplicated->AnyHaveMetadataValue('Identity', 'runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk'))">
-    <_PackageReferenceDeduplicated Remove="runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" />
-    <_PackageReferenceDeduplicated Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk"
+  <ItemGroup Condition="@(_PackageReferenceDeduplicated->AnyHaveMetadataValue('Identity', 'runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)'))">
+    <_PackageReferenceDeduplicated Remove="runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)" />
+    <_PackageReferenceDeduplicated Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)"
                                    Version="$(MonoLLVMSDKVersion)"
                                    PackageArch="$(BuildArchitecture)"/>
    </ItemGroup>

src/native/corehost/browserhost/CMakeLists.txt

@@ -93,7 +93,6 @@ target_link_options(browserhost PRIVATE
     -sEXPORTED_FUNCTIONS=_posix_memalign,_free,stackAlloc,stackRestore,stackSave,_BrowserHost_InitializeCoreCLR,_BrowserHost_ExecuteAssembly,___cpp_exception
     -sEXPORT_NAME=createDotnetRuntime
     -fwasm-exceptions
-    -msimd128
     -lnodefs.js
     -Wno-unused-command-line-argument
     -Wl,-error-limit=0)

src/native/libs/build-native.proj

@@ -20,6 +20,7 @@
     <_CMakeArgs Condition="'$(WasmEnableThreads)' == 'true'">$(_CMakeArgs) -cmakeargs "-DCMAKE_USE_PTHREADS=1"</_CMakeArgs>
     <_CMakeArgs Condition="'$(_IcuDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_ICU_DIR=$(_IcuDir)"</_CMakeArgs>
     <_CMakeArgs Condition="'$(_TzdDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_TZD_DIR=$(_TzdDir)"</_CMakeArgs>
+    <_CMakeArgs Condition="'$(TargetsBrowser)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'">$(_CMakeArgs) -cmakeargs "-DBUILD_LIBS_NATIVE_BROWSER=1"</_CMakeArgs>
 
     <_BuildNativeArgs>$(_BuildNativeArgs)$(_CMakeArgs)</_BuildNativeArgs>
   </PropertyGroup>

src/tests/CMakeLists.txt

@@ -41,26 +41,40 @@ if (CLR_CMAKE_HOST_WIN32)
     set_property(DIRECTORY PROPERTY CLR_EH_OPTION /EHa) # enable C++ EH (w/ SEH exceptions)
 endif()
 
-MACRO(SUBDIRLIST result curdir)
-  FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
-  SET(dirlist "")
-  FOREACH(child ${children})
-    IF(IS_DIRECTORY ${curdir}/${child})
-        LIST(APPEND dirlist ${child})
-    ENDIF()
-  ENDFOREACH()
-  SET(${result} ${dirlist})
-ENDMACRO()
-
-MACRO(ADDSUBDIR_REC  curdir)
-    SUBDIRLIST(SUB_DIRS ${curdir})
-    FOREACH(subdir ${SUB_DIRS})
-        if(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
-           ADD_SUBDIRECTORY(${curdir}/${subdir})
-        else()
-           ADDSUBDIR_REC(${curdir}/${subdir})
-        endif(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
+if(NOT CLR_CMAKE_TARGET_ARCH_WASM)
+    set(TEST_LIB_TYPE SHARED)
+    MACRO(SUBDIRLIST result curdir)
+    FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
+    SET(dirlist "")
+    FOREACH(child ${children})
+        IF(IS_DIRECTORY ${curdir}/${child})
+            LIST(APPEND dirlist ${child})
+        ENDIF()
     ENDFOREACH()
-ENDMACRO()
+    SET(${result} ${dirlist})
+    ENDMACRO()
+
+    MACRO(ADDSUBDIR_REC  curdir)
+        SUBDIRLIST(SUB_DIRS ${curdir})
+        FOREACH(subdir ${SUB_DIRS})
+            if(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
+            ADD_SUBDIRECTORY(${curdir}/${subdir})
+            else()
+            ADDSUBDIR_REC(${curdir}/${subdir})
+            endif(EXISTS "${curdir}/${subdir}/CMakeLists.txt")
+        ENDFOREACH()
+    ENDMACRO()
+    ADDSUBDIR_REC("${CMAKE_CURRENT_SOURCE_DIR}")
+else()
+    set(TEST_LIB_TYPE STATIC)
 
-ADDSUBDIR_REC("${CMAKE_CURRENT_SOURCE_DIR}")
+    add_compile_options(
+      -fwasm-exceptions 
+      -msimd128)
+    add_link_options(
+      -fwasm-exceptions 
+      )
+
+    # opt in into tests that make sense for WASM
+    add_subdirectory(JIT/interpreter)
+endif()

src/tests/JIT/interpreter/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories(${INC_PLATFORM_DIR})
 set(SOURCES pinvoke.cpp)
 
 # add the executable
-add_library (pinvoke SHARED ${SOURCES})
+add_library (pinvoke ${TEST_LIB_TYPE} ${SOURCES})
 
 # add the install targets
 install (TARGETS pinvoke DESTINATION bin)

src/tests/JIT/interpreter/Interpreter.cs

@@ -723,6 +723,13 @@ static void EnsureCallingConventionTestTargetMethodsAreJitted()
 
     static int Main(string[] args)
     {
+        // WASM-TODO this is just hello world for now
+        if (RuntimeInformation.ProcessArchitecture == Architecture.Wasm)
+        {
+            Console.WriteLine("WASM-TODO: Interpreter tests");
+            return 100;
+        }
+
         jitField1 = 42;
         jitField2 = 43;
 
@@ -2406,15 +2413,19 @@ static object BoxedSubtraction(object lhs, object rhs)
 
     public static bool TestPInvoke()
     {
-        if (sumTwoInts(1, 2) != 3)
-            return false;
+        // WASM-TODO enable once we have generated pinvoke and in-tree native re-link
+        if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
+        {
+            if (sumTwoInts(1, 2) != 3)
+                return false;
 
-        double summed = sumTwoDoubles(1, 2);
-        if (summed != 3)
-            return false;
+            double summed = sumTwoDoubles(1, 2);
+            if (summed != 3)
+                return false;
 
-        // Test marshaling wrappers
-        writeToStdout("Hello world from pinvoke.dll!writeToStdout\n");
+            // Test marshaling wrappers
+            writeToStdout("Hello world from pinvoke.dll!writeToStdout\n");
+        }
 
         bool caught = false;
         try {

src/tests/build.cmd

@@ -72,6 +72,11 @@ if /i "%1" == "--"                       (set processedArgs=!processedArgs! %1&s
 if /i "%1" == "x64"                      (set __BuildArch=x64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "x86"                      (set __BuildArch=x86&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "arm64"                    (set __BuildArch=arm64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "wasm"                     (set __BuildArch=wasm&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+
+if /i "%1" == "os"                       (set __TargetOS=%2&set processedArgs=!processedArgs! %1&shift&shift&goto Arg_Loop)
+if /i "%1" == "browser"                  (set __TargetOS=browser&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "wasi"                     (set __TargetOS=wasi&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 
 if /i "%1" == "debug"                    (set __BuildType=Debug&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "release"                  (set __BuildType=Release&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)

src/tests/build.sh

@@ -60,7 +60,7 @@ build_Tests()
     export MSBUILDDEBUGPATH
 
     if [[ "$__SkipNative" != 1 && "$__BuildTestWrappersOnly" != 1 && "$__GenerateLayoutOnly" != 1 && "$__CopyNativeTestBinaries" != 1 && \
-        "$__TargetOS" != "browser" && "$__TargetOS" != "android" && "$__TargetOS" != "ios" && "$__TargetOS" != "iossimulator" && "$__TargetOS" != "tvos" && "$__TargetOS" != "tvossimulator" ]]; then
+        "$__TargetOS" != "android" && "$__TargetOS" != "ios" && "$__TargetOS" != "iossimulator" && "$__TargetOS" != "tvos" && "$__TargetOS" != "tvossimulator" ]]; then
         build_native "$__TargetOS" "$__TargetArch" "$__TestDir" "$__NativeTestIntermediatesDir" "install" "$__CMakeArgs" "CoreCLR test component"
 
         if [[ "$?" -ne 0 ]]; then