Make wasmjit-diff.ps1 work with components

Utilizing 'wasm-tools unbundle'. Also change how the debug test exclusion works so that it is buildable in Release (useful for diffs).
dotnet · Jan 22, 2025 · 4c716db · 4c716db
1 parent 3762f8e
commit 4c716db
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/src/tests/Common/dirs.proj b/src/tests/Common/dirs.proj
@@ -27,7 +27,7 @@
       <DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\SharedLibrary\SharedLibrary.csproj" />
 
       <!-- Only automated on WASI with LLDB, which we don't have on Windows CI machines. -->
-      <DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\HelloWasm\WasmDebugging.csproj" Condition="'$(TargetOS)' == 'browser' or '$(OS)' == 'Windows_NT'" />
+      <DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\HelloWasm\WasmDebugging.csproj" Condition="'$(TargetOS)' == 'browser' or '$(OS)' == 'Windows_NT' or '$(Configuration)' != 'Debug'" />
       <DisabledProjects Include="$(TestRoot)readytorun\**\*.csproj" Condition="'$(TestBuildMode)' == 'nativeaot'" />
     </ItemGroup>
 

diff --git a/src/tests/nativeaot/SmokeTests/HelloWasm/WasmDebugging.csproj b/src/tests/nativeaot/SmokeTests/HelloWasm/WasmDebugging.csproj
@@ -5,9 +5,6 @@
     <InvariantGlobalization>true</InvariantGlobalization>
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
-
-    <!-- Only works without optimizations for now. -->
-    <CLRTestTargetUnsupported Condition="'$(Configuration)' != 'Debug'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetsWasi)' == 'true'">

diff --git a/src/tests/nativeaot/SmokeTests/HelloWasm/wasmjit-diff.ps1 b/src/tests/nativeaot/SmokeTests/HelloWasm/wasmjit-diff.ps1
@@ -50,6 +50,7 @@ if ($ShowHelp)
     Write-Host " further inspected using tools like git-diff."
     Write-Host ""
     Write-Host " -Analyze depends on https://github.com/WebAssembly/wabt tools being available in PATH."
+    Write-Host " -Analyze for WASI depends on https://github.com/bytecodealliance/wasm-tools being available in PATH."
     Write-Host " -Llvm depends on llvm-dis being available in PATH."
     Write-Host ""
     return
@@ -203,6 +204,29 @@ if ($Analyze -or $Summary)
     }
     else
     {
+        function WasmObjDump($Options, $Path)
+        {
+            if ($OS -eq "wasi")
+            {
+                $UnbundlePath = "$([IO.Path]::GetDirectoryName($Path))/wasmjit-diff"
+                if (!(Test-Path $UnbundlePath))
+                {
+                    mkdir $UnbundlePath > $null | Write-Verbose
+                }
+                $CoreModulePath = "$UnbundlePath/unbundled-module0.wasm"
+                $ComponentTimeStamp = (Get-ChildItem $Path).LastAccessTime
+                $CoreModuleTimeStamp = (Get-ChildItem $CoreModulePath -ErrorAction Ignore).LastAccessTime
+                if ($ComponentTimeStamp -gt $CoreModuleTimeStamp)
+                {
+                    # Component newer than our cached core module, update the latter.
+                    Write-Host "Unbundling $Path as $CoreModulePath"
+                    wasm-tools component unbundle $Path --module-dir $UnbundlePath > $null
+                }
+                $Path = $CoreModulePath
+            }
+            return wasm-objdump @Options $Path
+        }
+
         $WasmSummaryLineRegex = [Regex]::New(" - func\[(\d+)\] size=(\d+) <(.*)>", "Compiled")
         function ParseWasmSummary($RawSummary, $SummaryName)
         {
@@ -243,8 +267,8 @@ if ($Analyze -or $Summary)
             return $SummaryList, $TotalCodeSize
         }
 
-        $BaseSummaryRaw = wasm-objdump -x -j Code $TestProjectBaseWasmOutput
-        $DiffSummaryRaw = wasm-objdump -x -j Code $TestProjectWasmOutput
+        $BaseSummaryRaw = WasmObjDump @("-x", "-j", "Code") $TestProjectBaseWasmOutput
+        $DiffSummaryRaw = WasmObjDump @("-x", "-j", "Code") $TestProjectWasmOutput
 
         $BaseSummary, $TotalBaseCodeSize = ParseWasmSummary $BaseSummaryRaw "base"
         $DiffSummary, $TotalDiffCodeSize = ParseWasmSummary $DiffSummaryRaw "diff"
@@ -357,9 +381,9 @@ if ($Analyze -or $Summary)
             else
             {
                 Write-Host "Collecting full disassembly for the base..."
-                $BaseWat = wasm-objdump -d $TestProjectBaseWasmOutput
+                $BaseWat = WasmObjDump @("-d") $TestProjectBaseWasmOutput
                 Write-Host "Collecting full disassembly for the diff..."
-                $DiffWat = wasm-objdump -d $TestProjectWasmOutput
+                $DiffWat = WasmObjDump @("-d") $TestProjectWasmOutput
 
                 function CreateWatIndex($Wat)
                 {