Skip to content

Commit c81e311

Browse files
committed
Add Windows assembly files to the build
Windows ASM files generated along side the ATT assembly files. Adding them to the build so they can be used.
1 parent 0cecccd commit c81e311

19 files changed

Lines changed: 148972 additions & 270 deletions

.github/workflows/os-check.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,12 @@ jobs:
542542
fail-fast: false
543543
matrix:
544544
arch: [ x64, Win32, ARM64 ]
545+
asm: [ false ]
546+
include:
547+
# Intel assembly build (x64 only): assembles the crypto .asm files
548+
# and enables the matching USE_INTEL_SPEEDUP code paths.
549+
- arch: x64
550+
asm: true
545551
# This should be a safe limit for the tests to run.
546552
timeout-minutes: 6
547553
env:
@@ -566,7 +572,7 @@ jobs:
566572
working-directory: ${{env.GITHUB_WORKSPACE}}
567573
# Add additional options to the MSBuild command line here (like platform or verbosity level).
568574
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
569-
run: msbuild /m /p:PlatformToolset=v142 /p:Platform=${{matrix.arch}} /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
575+
run: msbuild /m /p:PlatformToolset=v142 /p:Platform=${{matrix.arch}} /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:WolfSSLIntelAsm=${{matrix.asm}} ${{env.SOLUTION_FILE_PATH}}
570576

571577
- if: ${{ matrix.arch != 'ARM64' }}
572578
name: Run Test

.github/workflows/win-csharp-test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ jobs:
1313
if: ${{ (github.repository_owner == 'wolfssl') && (github.event_name != 'pull_request' || github.event.pull_request.draft == false) }}
1414
runs-on: windows-latest
1515

16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
# false: pure C. true: assemble the crypto .asm files and enable the
20+
# USE_INTEL_SPEEDUP code paths (x64).
21+
asm: [ false, true ]
22+
1623
# This should be a safe limit for the tests to run.
1724
timeout-minutes: 6
1825

@@ -48,7 +55,7 @@ jobs:
4855
working-directory: ${{env.GITHUB_WORKSPACE}}
4956
# Add additional options to the MSBuild command line here (like platform or verbosity level).
5057
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
51-
run: msbuild /m /p:PlatformToolset=v142 /p:Platform=${{env.BUILD_PLATFORM}} /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
58+
run: msbuild /m /p:PlatformToolset=v142 /p:Platform=${{env.BUILD_PLATFORM}} /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:WolfSSLIntelAsm=${{matrix.asm}} ${{env.SOLUTION_FILE_PATH}}
5259

5360
- name: Run wolfCrypt test
5461
working-directory: ${{env.GITHUB_WORKSPACE}}wolfssl\wrapper\CSharp\Debug\x64\

0 commit comments

Comments
 (0)