[pthreads] support ARM arch and UWP platform by luncliff · Pull Request #16348 · microsoft/vcpkg

luncliff · 2021-02-21T18:27:06Z

What does your PR fix?

Check TRIPLET_SYSTEM_ARCH contains arm.
If so, replace macro function PTW32_PROGCTR to __PTW32_PROGCTR so the build step can advance from preprocessing.
If VCPKG_TARGET_IS_UWP, place #pragma to link with kernel32.lib and windowsapp.lib.
Also, inject linker option /APPCONTAINER with LINK environment variable.
Migrate CONTROL to vcpkg.json

Which triplets are supported/not supported? Have you updated the CI baseline?

All arm triplets for Windows (including uwp) should become available.

arm64-windows
arm-windows
arm64-uwp
x64-uwp

Does your PR follow the maintainer guide?

Wish the change followed the guide well.

~~I used vcpkg_replace_string instead of adding a new .patch since the source code change is trivial (3 lines in total).~~
Any suggestions will be welcomed :)

* arm: enable macro __PTW32_PROGCTR * uwp: LINK option /APPCONTAINER * uwp: link with 'kernel32', 'windowsapp'

JackBoosY · 2021-02-22T05:49:18Z

cc @strega-nil for review this PR again.

poppler regression is not related to this PR.

JackBoosY · 2021-02-22T07:16:17Z

Poppler regression is fixing in #16356.

strega-nil · 2021-02-22T18:48:58Z

@luncliff please use patches instead of this; it'll be much clearer to future maintainers. if you need any help setting that up, please ask :) (and the way you'd do that is via set(extra_patches blah.patch bloop.patch), and then passing ${extra_patches} to PATCHES)

luncliff · 2021-02-26T05:00:09Z

So I just extracted code changes to a single patch (fix-arm-uwp.patch), but seems like the macro __cplusplus_winrt is not provided while NMAKE is running.

I think explicitly specifying kernel32 won't matter. But WindowsApp is for UWP only.
In this case, should I use vcpkg_apply_patches?

# portfile.cmake
if(VCPKG_TARGET_IS_UWP)
  vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES add-uwp-pragma.patch)
  # https://docs.microsoft.com/en-us/cpp/build/reference/linker-options
  # https://docs.microsoft.com/en-us/cpp/build/reference/linking#link-environment-variables
  set(ENV{LINK} "/APPCONTAINER")
endif()
# ...

luncliff · 2021-02-26T05:07:36Z

For future visitors who are using NMAKE, nmake-build-arm-uwp-release-out.log from 7390ef3 was like the following.

You can find well known Win32 API functions are there. And be aware of the RoInitialize with the name of __scrt_initialize_winrt. This is why I added WindowsApp.lib

	cl /errorReport:none /nologo /MD /I. /DHAVE_CONFIG_H /W3 /O2 /Ob2  /D__PTW32_BUILD_INLINED /D__PTW32_CLEANUP_C -c pthread.c
pthread.c
	rc /d__PTW32_ARCHAMD64 /d__PTW32_RC_MSC /d__PTW32_CLEANUP_C version.rc
Microsoft (R) Windows (R) Resource Compiler Version 10.0.10011.16384

Copyright (C) Microsoft Corporation.  All rights reserved.


	cl /errorReport:none /nologo /LDd /Zi pthread.obj version.res /link /implib:pthreadVC3.lib  /out:pthreadVC3.dll
   Creating library pthreadVC3.lib and object pthreadVC3.exp
pthread.obj : error LNK2019: unresolved external symbol __imp_CloseHandle referenced in function __ptw32_callUserDestroyRoutines
pthread.obj : error LNK2019: unresolved external symbol __imp_DuplicateHandle referenced in function pthread_self
pthread.obj : error LNK2019: unresolved external symbol __imp_RaiseException referenced in function SetThreadName
MSVCRT.lib(helpexcept.obj) : error LNK2001: unresolved external symbol __imp_RaiseException
pthread.obj : error LNK2019: unresolved external symbol __imp_GetLastError referenced in function __ptw32_pop_cleanup
pthread.obj : error LNK2019: unresolved external symbol __imp_SetLastError referenced in function __ptw32_pop_cleanup
pthread.obj : error LNK2019: unresolved external symbol __imp_SetEvent referenced in function __ptw32_callUserDestroyRoutines
pthread.obj : error LNK2019: unresolved external symbol __imp_ResetEvent referenced in function __ptw32_cancelable_wait
pthread.obj : error LNK2019: unresolved external symbol __imp_ReleaseSemaphore referenced in function sem_post
pthread.obj : error LNK2019: unresolved external symbol __imp_WaitForSingleObject referenced in function __ptw32_callUserDestroyRoutines
pthread.obj : error LNK2019: unresolved external symbol __imp_CreateEventA referenced in function __ptw32_callUserDestroyRoutines
pthread.obj : error LNK2019: unresolved external symbol __imp_Sleep referenced in function __ptw32_callUserDestroyRoutines
pthread.obj : error LNK2019: unresolved external symbol __imp_WaitForMultipleObjects referenced in function __ptw32_cancelable_wait
pthread.obj : error LNK2019: unresolved external symbol __imp_GetCurrentProcess referenced in function __ptw32_getprocessors
pthread.obj : error LNK2019: unresolved external symbol __imp_GetCurrentProcessId referenced in function pthread_setaffinity_np
MSVCRT.lib(gs_support.obj) : error LNK2001: unresolved external symbol __imp_GetCurrentProcessId
pthread.obj : error LNK2019: unresolved external symbol __imp_GetCurrentThread referenced in function pthread_self
pthread.obj : error LNK2019: unresolved external symbol __imp_GetCurrentThreadId referenced in function pthread_self
...
MSVCRT.lib(gs_support.obj) : error LNK2019: unresolved external symbol __imp_QueryPerformanceCounter referenced in function __get_entropy
MSVCRT.lib(tncleanup.obj) : error LNK2019: unresolved external symbol __imp_InitializeSListHead referenced in function "void __cdecl __scrt_initialize_type_info(void)" (?__scrt_initialize_type_info@@YAXXZ)
MSVCRT.lib(utility_app.obj) : error LNK2019: unresolved external symbol __imp_RoInitialize referenced in function __scrt_initialize_winrt
MSVCRT.lib(cpu_disp.obj) : error LNK2019: unresolved external symbol IsProcessorFeaturePresent referenced in function __isa_available_init
pthreadVC3.dll : fatal error LNK1120: 40 unresolved externals

strega-nil · 2021-02-26T22:44:10Z

fwiw, in the future you can do:

if(VCPKG_TARGET_IS_UWP)
    set(platform_patches fix-arm-uwp.patch)
endif()

vcpkg_from_sourceforge(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO pthreads4w
    FILENAME "pthreads4w-code-v${PTHREADS4W_VERSION}.zip"
    SHA512 49e541b66c26ddaf812edb07b61d0553e2a5816ab002edc53a38a897db8ada6d0a096c98a9af73a8f40c94283df53094f76b429b09ac49862465d8697ed20013
    PATCHES
        ${platform_patches}
)

JackBoosY · 2021-03-01T07:30:03Z

Please add the following codes to ci.baseline.txt:

darknet:arm64-windows
darknet:arm-uwp
fontconfig:x64-uwp
fontconfig:arm-uwp
fontconfig:arm64-windows

luncliff · 2021-04-03T14:54:15Z

Fixed some collisions with #17011.

JackBoosY · 2021-04-05T04:52:24Z

Please add clamav:arm64-windows=fail to scripts/ci.baseline.txt.

luncliff · 2021-04-05T05:09:08Z

Please add clamav:arm64-windows=fail to scripts/ci.baseline.txt.

Thanks for the check, @JackBoosY. Applied in 34d4f9e :)

luncliff added 2 commits February 22, 2021 03:13

[pthreads] support ARM/UWP

18d88a6

* arm: enable macro __PTW32_PROGCTR * uwp: LINK option /APPCONTAINER * uwp: link with 'kernel32', 'windowsapp'

[pthreads] update baseline and port SHA

202d400

JonLiu1993 assigned JackBoosY Feb 22, 2021

JackBoosY added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Feb 22, 2021

JackBoosY approved these changes Feb 22, 2021

View reviewed changes

JackBoosY requested a review from strega-nil February 22, 2021 05:48

JackBoosY added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. requires:discussion labels Feb 22, 2021

JackBoosY added requires:author-response and removed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. requires:discussion labels Feb 23, 2021

luncliff added 2 commits February 26, 2021 12:55

[pthreads] extract changes to patch

ec80478

[pthreads] remove pthreads from ci.baseline.txt

7390ef3

[pthreads] separate uwp patch

800caf7

update ci.baseline.txt for arm/arm64

e4e3556

JackBoosY removed the requires:author-response label Mar 1, 2021

JackBoosY approved these changes Mar 2, 2021

View reviewed changes

JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Mar 2, 2021

luncliff added 2 commits April 3, 2021 23:37

Merge branch 'master' into port/pthreads

927b8de

[pthreads] unify patch list

51f4bbf

JackBoosY added the requires:author-response label Apr 5, 2021

JackBoosY approved these changes Apr 5, 2021

View reviewed changes

update ci.baseline.txt

34d4f9e

JackBoosY removed the requires:author-response label Apr 5, 2021

vicroms merged commit b466bd5 into microsoft:master Apr 7, 2021

luncliff deleted the port/pthreads branch April 8, 2021 00:50

luncliff mentioned this pull request Apr 10, 2021

[pthreadpool] update sources and support find_package #17196

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[pthreads] support ARM arch and UWP platform#16348

[pthreads] support ARM arch and UWP platform#16348
vicroms merged 9 commits intomicrosoft:masterfrom
luncliff:port/pthreads

luncliff commented Feb 21, 2021 •

edited

Loading

Uh oh!

JackBoosY commented Feb 22, 2021

Uh oh!

JackBoosY commented Feb 22, 2021

Uh oh!

strega-nil commented Feb 22, 2021

Uh oh!

luncliff commented Feb 26, 2021 •

edited

Loading

Uh oh!

luncliff commented Feb 26, 2021 •

edited

Loading

Uh oh!

strega-nil commented Feb 26, 2021

Uh oh!

JackBoosY commented Mar 1, 2021

Uh oh!

luncliff commented Apr 3, 2021

Uh oh!

JackBoosY commented Apr 5, 2021

Uh oh!

luncliff commented Apr 5, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

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

Uh oh!

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

Uh oh!

JackBoosY commented Feb 22, 2021

Uh oh!

JackBoosY commented Feb 22, 2021

Uh oh!

strega-nil commented Feb 22, 2021

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

strega-nil commented Feb 26, 2021

Uh oh!

JackBoosY commented Mar 1, 2021

Uh oh!

luncliff commented Apr 3, 2021

Uh oh!

JackBoosY commented Apr 5, 2021

Uh oh!

luncliff commented Apr 5, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

luncliff commented Feb 21, 2021 •

edited

Loading

luncliff commented Feb 26, 2021 •

edited

Loading

luncliff commented Feb 26, 2021 •

edited

Loading