Re: Native compilation on Windows, was Re: Bootstrap Compilation Speed

[Corwin Brust <corwin@bru.st>]

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]

Ahoy Dieter!

On Tue, Feb 1, 2022 at 6:45 AM H. Dieter Wilhelm
<dieter@duenenhof-wilhelm.de> wrote:
>
> I realised that ntldd.exe doesn't show any msys/mingw dependencies at
> all, only Windows stuff! -> So I removed all Windows references from
> PATH.  (Don't ask me why ntldd searches Windows paths first.)
>
> Then, it seem's, that the msys/mingw people changed the tree layout of
> their files!  When I'm changing "msys64" with "mingw64" in
> build-dep-zips.py:
[snip]
>           ## if len(splt) > 2 and "msys64" in splt[2]:
>           if len(splt) > 2 and "mingw64" in splt[2]:

With this, we are much closer.   New set is uploaded to the
with-native-compilation folder in the usual Not Sure If We Are Ready
For Prime Time location[1].

This version has 62 DLLs as were listed in the txt file attached to my
recent reply to to Phil in this same thread.  I still need to review
those against the 77 you reported from 27.2 but that's not going to be
tonight.

Meanwhile, I tested these (using the zip with deps version) on kiddos
gaming rig and verified that the tests from w32-feature pass,
package-refresh-package works, and various types of image load.  I
also checked with ProcessExplorer that I'm not loading DLLs except
those provided with the dist and those under some windows/system path.

As an interesting aside:  I see that it *is* loading the natively
compiled sources that were build and packaged with Emacs.  This is
despite getting a nil return from `native-comp-avialable-p', which
suggests that even people without a local libgccjit+gcc (e.g. a
working MSYS) can benefit from (the bundled) nativly compiled sources
we distribute.  [[stroking chin myscheviously]]

Please let me know if you think these are ready to push to alpha.

Attached are dffs for admin/nt/dist-build thus far.

[1] https://git.sr.ht/~mplscorwin/emacs-w64

[-- Attachment #2: emacs-28-nt-dist-build.patch --]
[-- Type: application/octet-stream, Size: 2865 bytes --]

diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index c27045a001..9b8492ff0e 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -37,6 +37,7 @@
 mingw-w64-x86_64-librsvg
 mingw-w64-x86_64-libtiff
 mingw-w64-x86_64-libxml2
+mingw-w64-x86_64-gmp
 mingw-w64-x86_64-xpm-nox'''.split()
 
 DLL_REQ='''libgif
@@ -49,7 +50,9 @@
 librsvg
 libtiff
 libxml
-libXpm'''.split()
+libgmp
+libXpm
+libXpm-noX4'''.split()
 
 
 ## Options
@@ -101,7 +104,7 @@ def ntldd_munge(out):
 
         ## if it's the former, we want it, if its the later we don't
         splt = dep.split()
-        if len(splt) > 2 and "msys64" in splt[2]:
+        if len(splt) > 2 and "mingw64" in splt[2]:
             print("Adding dep", splt[0])
             rtn.append(splt[0].split(".")[0])
 
@@ -121,7 +124,7 @@ def ntldd_munge(out):
 
 ## Currently no packages seem to require this!
 ARCH_PKGS=[]
-SRC_REPO="https://sourceforge.net/projects/msys2/files/REPOS/MINGW/Sources"
+SRC_REPO="https://repo.msys2.org/mingw/sources"
 
 
 def immediate_deps(pkg):
@@ -167,7 +170,7 @@ def download_source(tarball):
     if not os.path.exists("../emacs-src-cache/{}".format(tarball)):
         print("Downloading {}...".format(tarball))
         check_output_maybe(
-            "wget -a ../download.log -O ../emacs-src-cache/{} {}/{}/download"
+            "wget -a ../download.log -O ../emacs-src-cache/{} {}/{}"
             .format(tarball, SRC_REPO, tarball),
             shell=True
         )
diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh
index 77d20a5a7b..fc3c40d691 100755
--- a/admin/nt/dist-build/build-zips.sh
+++ b/admin/nt/dist-build/build-zips.sh
@@ -47,13 +47,15 @@
     then
         echo [build] Configuring Emacs
         $REPO_DIR/$BRANCH/configure \
+	    --with-json \
             --without-dbus \
+            --with-native-compilation \
             --without-compress-install \
             $CACHE \
-            CFLAGS="$CFLAGS"
+            CFLAGS="$CFLAGS" 
     fi
 
-    make -j 4 $INSTALL_TARGET \
+    make -j 20 $INSTALL_TARGET \
          prefix=$HOME/emacs-build/install/emacs-$VERSION
     cd $HOME/emacs-build/install/emacs-$VERSION
     zip -r -9 emacs-$OF_VERSION-no-deps.zip *
@@ -96,7 +98,7 @@ BUILD=
 BUILD_64=1
 GIT_UP=0
 CONFIG=1
-CFLAGS="-O2 -static"
+CFLAGS="-O2"
 INSTALL_TARGET="install-strip"
 
 ## The location of the git repo
@@ -125,7 +127,7 @@ REPO_DIR=
         ;;
     s)
         SNAPSHOT="-snapshot"
-        CFLAGS="-O2 -static -g3"
+        CFLAGS="-O2 -g3"
         INSTALL_TARGET="install"
         ;;
     h)
@@ -191,7 +193,7 @@ OF_VERSION=
     OF_VERSION="$VERSION-`date +%Y-%m-%d`"
     ## Use snapshot dependencies
     SNAPSHOT=1
-    CFLAGS="-O2 -static -g3"
+    CFLAGS="-O2 -g3"
     INSTALL_TARGET="install"
 fi