Switch test-release.sh to build with cmake by default (PR21561)

[hans]

Summary

Here is a stab at switch the release script to build with cmake instead of autoconf. It retains an option to build with autoconf for platforms where that's necessary, such as Darwin.

Here is a diff between the resulting tarballs of building 3.6.1-rc1 on Linux with the old script vs. this new version:

cmakediff15 KBDownload

.

I removed the -build-triple option. That seems to be intended for cross-compiling and won't work with cmake. Does anyone know if that's actually used for any of our release binaries?

I'm also considering removing the "do_64bit" thing, as I'm not entirely sure how that's supposed to work. For me, it seems to always build two 64-bit packages. Let me know what you think.

(I will hold off committing this in any case until 3.6.2 is out the door to avoid that getting built with the wrong version script.)

[dsanders]

I removed the -build-triple option. That seems to be intended for cross-compiling and won't work with cmake. Does > anyone know if that's actually used for any of our release binaries?

The Mips releases use it to workaround to a long-standing target triple bug. The problem is that config.guess reports mips64-linux-gnu/mips64el-linux-gnu for all of my test machines. This is fine for GCC because there's no real difference between those triples and mips-linux-gnu/mipsel-linux-gnu (both _usually_ emit 32-bit code by default). Unfortunately, the triples currently have strict meanings in LLVM and mips64/mips64el triples are unable to emit the 32-bit code that is used by the rest of the installed Debian. As a result, I have to tell ./configure that the build system is really mips-linux-gnu/mipsel-linux-gnu so that it does the right thing. The work I'm doing on target triples at the moment will make it possible to fix it but the actual fix is unlikely to be ready for LLVM 3.7.

For CMake, I have to set LLVM_TARGET_ARCH, and LLVM_HOST_TRIPLE instead.

I'm also considering removing the "do_64bit" thing, as I'm not entirely sure how that's supposed to work.

Me neither.

[hans]

• Dropping 'do_64bit'
• Adding '-configure-flags' options to allow e.g. setting LLVM_TARGET_ARCH, and LLVM_HOST_TRIPLE or --build to cmake or configure.

[hans]

Tweak the file comparison step to upgrade 'Phase2' strings to 'Phase3' to ignore file path diffs in the debug info.

[rengolin]

About cross compiling, it does work with CMake, but maybe not with this script. Though, people running cross-builds could still use autoconf. Maybe the MIPS release is done in that way? I'm building native on both ARM and AArch64, so that's not a problem for me.

utils/release/test-release.sh

96 ↗

(On Diff #28513)

I actually use this option on ARM.

The problem here is that this script assumes x86_64, and that it builds 32 and 64 binaries. With this option, the script skips the 64-bit version. On ARM, if I don't use this, it will build two identical versions but call them 32-bit and 64-bit, which is just wrong and wastes time.

I see that you also removes the "Release-64" down there, so I believe that would be fine with me, too.

[dsanders]

Maybe the MIPS release is done in that way? I'm building native on both ARM and AArch64, so that's not a problem for me.

I build native too. It's just that mips64-linux-gnu (from config.guess) should be synonymous with mips-linux-gnu (the triple used by the OS) on this OS but clang (currently) treats them as having different meanings.

[rengolin]

Right, ok. Still, feels a bit wrong to disable cross-compiling on autoconf just because the default is CMake.

If it's possible to set the triple in the new flags option, should be ok. If not, maybe we should just keep it for a while, at least until we can cross-compile on CMake.

[hans]

In D10715#204489, @rengolin wrote:

Right, ok. Still, feels a bit wrong to disable cross-compiling on autoconf just because the default is CMake.

If it's possible to set the triple in the new flags option, should be ok. If not, maybe we should just keep it for a while, at least until we can cross-compile on CMake.

I figured since everyone I know of is doing native builds, the "-build-triple" flag isn't getting much use anyway. If someone does want to pass the "--build=" flag to configure, they can do it with the "-configure-flags" option.

[hans]

utils/release/test-release.sh

96 ↗

(On Diff #28513)

On ARM, if I don't use this, it will build two identical versions but call them 32-bit and 64-bit, which is just wrong and wastes time.

It did the same for me on x86: two 64-bit versions. The whole set-up seemed broken, so I removed the "Release-64" flavour below and then there's no need for the '-no-64bit' flag anymore.

[hans]

Rebase.

[rengolin]

utils/release/test-release.sh

268 ↗

(On Diff #29709)

What I normally do in these cases is to set the command line to a variable, then just:

echo $cmd
$cmd

or something to that effect, controlling the output / errors as you want, later.

[dsanders]

utils/release/test-release.sh

268 ↗

(On Diff #29709)

Doesn't that cause problems with whitespace and quotes being reparsed?

[hans]

utils/release/test-release.sh

268 ↗

(On Diff #29709)

I worry about that too. I'd like to not change this at this moment.

[hans]

I'm going to commit this now so we can tag 3.7.0-rc1 and start testing it. Please let me know if you have more concerns.

[dsanders]

I'm going to commit this now so we can tag 3.7.0-rc1 and start testing it. Please let me know if you have more concerns.

No problem. I was about to say LGTM. My trial build with this patch and D6563 applied finished this morning. I have a few problems but none are directly related to the new build method except in so far as we now build projects we didn't in 3.6.2.

For reference the issues are in 'make check-all' and all except one are for projects that weren't enabled in LLVM 3.6.2.
Failing Tests (7):

AddressSanitizer-mips-linux :: TestCases/Linux/kernel-area.cc
AddressSanitizer-mips-linux :: TestCases/Posix/coverage-direct-large.cc
Clang :: Driver/cuda-options.cu
UBSan-ASan-mips :: TestCases/Float/cast-overflow.cpp
UBSan-Standalone-mips :: TestCases/Float/cast-overflow.cpp
libc++abi :: backtrace_test.pass.cpp
libc++abi :: test_demangle.pass.cpp

I had to kill an excessively long 'llc -march=r600 -mcpu=cypress' process (>500 minutes) to make the tests finish. I assume it's one of those failures.

[hans]

In D10715#206227, @dsanders wrote:

I'm going to commit this now so we can tag 3.7.0-rc1 and start testing it. Please let me know if you have more concerns.

No problem. I was about to say LGTM. My trial build with this patch and D6563 applied finished this morning. I have a few problems but none are directly related to the new build method except in so far as we now build projects we didn't in 3.6.2.

For reference the issues are in 'make check-all' and all except one are for projects that weren't enabled in LLVM 3.6.2.
Failing Tests (7):

AddressSanitizer-mips-linux :: TestCases/Linux/kernel-area.cc
AddressSanitizer-mips-linux :: TestCases/Posix/coverage-direct-large.cc
Clang :: Driver/cuda-options.cu
UBSan-ASan-mips :: TestCases/Float/cast-overflow.cpp
UBSan-Standalone-mips :: TestCases/Float/cast-overflow.cpp
libc++abi :: backtrace_test.pass.cpp
libc++abi :: test_demangle.pass.cpp

I had to kill an excessively long 'llc -march=r600 -mcpu=cypress' process (>500 minutes) to make the tests finish. I assume it's one of those failures.

Great, thanks for testing! And please file bugs for the failing tests :)

llvm/trunk/utils/release/test-release.sh

 Base_url="http://llvm.org/svn/llvm-project"
 
 Release=""
 Release_no_dot=""
 RC=""
 Triple=""
 use_gzip="no"
 do_checkout="yes"
-do_64bit="yes"
 do_debug="no"
 do_asserts="no"
 do_compare="yes"
 BuildDir="`pwd`"
-BuildTriple=""
+use_autoconf="no"
+ExtraConfigureFlags=""
 
 function usage() {
     echo "usage: `basename $0` -release X.Y.Z -rc NUM [OPTIONS]"
     echo ""
     echo " -release X.Y.Z       The release version to test."
     echo " -rc NUM              The pre-release candidate number."
     echo " -final               The final release candidate."
     echo " -triple TRIPLE       The target triple for this machine."
     echo " -j NUM               Number of compile jobs to run. [default: 3]"
     echo " -build-dir DIR       Directory to perform testing in. [default: pwd]"
     echo " -no-checkout         Don't checkout the sources from SVN."
-    echo " -no-64bit            Don't test the 64-bit version. [default: yes]"
     echo " -test-debug          Test the debug build. [default: no]"
     echo " -test-asserts        Test with asserts on. [default: no]"
     echo " -no-compare-files    Don't test that phase 2 and 3 files are identical."
     echo " -use-gzip            Use gzip instead of xz."
-    echo " -build-triple TRIPLE The build triple for this machine"
-    echo "                      [default: use config.guess]"
+    echo " -configure-flags FLAGS  Extra flags to pass to the configure step."
+    echo " -use-autoconf        Use autoconf instead of cmake"
 }
 
+if [ `uname -s` = "Darwin" ]; then
+  # compiler-rt doesn't yet build with CMake on Darwin.
+  use_autoconf="yes"
+fi
+
 while [ $# -gt 0 ]; do
     case $1 in
         -release | --release )
             shift
             Release="$1"
             Release_no_dot="`echo $1 | sed -e 's,\.,,g'`"
             ;;
         -rc | --rc | -RC | --RC )
             shift
             RC="rc$1"
             ;;
         -final | --final )
             RC=final
             ;;
         -triple | --triple )
             shift
             Triple="$1"
             ;;
-        -build-triple | --build-triple )
+        -configure-flags | --configure-flags )
             shift
-            BuildTriple="$1"
+            ExtraConfigureFlags="$1"
             ;;
         -j* )
             NumJobs="`echo $1 | sed -e 's,-j\([0-9]*\),\1,g'`"
             if [ -z "$NumJobs" ]; then
                 shift
                 NumJobs="$1"
             fi
             ;;
         -build-dir | --build-dir | -builddir | --builddir )
             shift
             BuildDir="$1"
             ;;
         -no-checkout | --no-checkout )
             do_checkout="no"
             ;;
-        -no-64bit | --no-64bit )
-            do_64bit="no"
-            ;;
         -test-debug | --test-debug )
             do_debug="yes"
             ;;
         -test-asserts | --test-asserts )
             do_asserts="yes"
             ;;
         -no-compare-files | --no-compare-files )
             do_compare="no"
             ;;
         -use-gzip | --use-gzip )
             use_gzip="yes"
             ;;
+        -use-autoconf | --use-autoconf )
+            use_autoconf="yes"
+            ;;
         -help | --help | -h | --h | -\? )
             usage
             exit 0
             ;;
         * )
             echo "unknown option: $1"
             usage
             exit 1

 }
 
 function configure_llvmCore() {
     Phase="$1"
     Flavor="$2"
     ObjDir="$3"
 
     case $Flavor in
-        Release | Release-64 )
-            Optimized="yes"
-            Assertions="no"
+        Release )
+            BuildType="Release"
+            Assertions="OFF"
+            ConfigureFlags="--enable-optimized --disable-assertions"
             ;;
         Release+Asserts )
-            Optimized="yes"
-            Assertions="yes"
+            BuildType="Release"
+            Assertions="ON"
+            ConfigureFlags="--enable-optimized --enable-assertions"
             ;;
         Debug )
-            Optimized="no"
-            Assertions="yes"
+            BuildType="Debug"
+            Assertions="ON"
+            ConfigureFlags="--disable-optimized --enable-assertions"
             ;;
         * )
             echo "# Invalid flavor '$Flavor'"
             echo ""
             return
             ;;
     esac
 
     echo "# Using C compiler: $c_compiler"
     echo "# Using C++ compiler: $cxx_compiler"
 
-    build_triple_option="${BuildTriple:+--build=$BuildTriple}"
-
     cd $ObjDir
     echo "# Configuring llvm $Release-$RC $Flavor"
-    echo "# $BuildDir/llvm.src/configure \
-        --enable-optimized=$Optimized \
-        --enable-assertions=$Assertions \
-        --disable-timestamps \
-        $build_triple_option"
+
+    if [ "$use_autoconf" = "yes" ]; then
+        echo "#" env CC="$c_compiler" CXX="$cxx_compiler" \
+            $BuildDir/llvm.src/configure \
+            $ConfigureFlags --disable-timestamps $ExtraConfigureFlags \
+            2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
         env CC="$c_compiler" CXX="$cxx_compiler" \
             $BuildDir/llvm.src/configure \
-        --enable-optimized=$Optimized \
-        --enable-assertions=$Assertions \
-        --disable-timestamps \
-        $build_triple_option \
+            $ConfigureFlags --disable-timestamps $ExtraConfigureFlags \
+            2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+    else
+        echo "#" env CC="$c_compiler" CXX="$cxx_compiler" \
+            cmake -G "Unix Makefiles" \
+            -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
+            -DLLVM_ENABLE_TIMESTAMPS=OFF -DLLVM_CONFIGTIME="(timestamp not enabled)" \
+            $ExtraConfigureFlags $BuildDir/llvm.src \
             2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+        env CC="$c_compiler" CXX="$cxx_compiler" \
+            cmake -G "Unix Makefiles" \
+            -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
+            -DLLVM_ENABLE_TIMESTAMPS=OFF -DLLVM_CONFIGTIME="(timestamp not enabled)" \
+            $ExtraConfigureFlags $BuildDir/llvm.src \
+            2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+    fi
+
     cd $BuildDir
 }
 
 function build_llvmCore() {
     Phase="$1"
     Flavor="$2"
     ObjDir="$3"
     DestDir="$4"
-    ExtraOpts=""
-
-    if [ "$Flavor" = "Release-64" ]; then
-        ExtraOpts="EXTRA_OPTIONS=-m64"
-    fi
 
     cd $ObjDir
     echo "# Compiling llvm $Release-$RC $Flavor"
-    echo "# ${MAKE} -j $NumJobs VERBOSE=1 $ExtraOpts"
-    ${MAKE} -j $NumJobs VERBOSE=1 $ExtraOpts \
+    echo "# ${MAKE} -j $NumJobs VERBOSE=1"
+    ${MAKE} -j $NumJobs VERBOSE=1 \
         2>&1 | tee $LogDir/llvm.make-Phase$Phase-$Flavor.log
 
     echo "# Installing llvm $Release-$RC $Flavor"
     echo "# ${MAKE} install"
     ${MAKE} install \
         DESTDIR="${DestDir}" \
         2>&1 | tee $LogDir/llvm.install-Phase$Phase-$Flavor.log
     cd $BuildDir
 }
 
 function test_llvmCore() {
     Phase="$1"
     Flavor="$2"
     ObjDir="$3"
 
     cd $ObjDir
-    ${MAKE} -k check-all \
+    ${MAKE} -j $NumJobs -k check-all \
         2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log
+
+    if [ "$use_autoconf" = "yes" ]; then
+        # In the cmake build, unit tests are run as part of check-all.
         ${MAKE} -k unittests \
             2>&1 | tee $LogDir/llvm.unittests-Phase$Phase-$Flavor.log
+    fi
+
     cd $BuildDir
 }
 
 # Clean RPATH. Libtool adds the build directory to the search path, which is
 # not necessary --- and even harmful --- for the binary packages we release.
 function clean_RPATH() {
   if [ `uname -s` = "Darwin" ]; then
     return

 (
 Flavors="Release"
 if [ "$do_debug" = "yes" ]; then
     Flavors="Debug $Flavors"
 fi
 if [ "$do_asserts" = "yes" ]; then
     Flavors="$Flavors Release+Asserts"
 fi
-if [ "$do_64bit" = "yes" ]; then
-    Flavors="$Flavors Release-64"
-fi
 
 for Flavor in $Flavors ; do
     echo ""
     echo ""
     echo "********************************************************************************"
     echo "  Release:     $Release-$RC"
     echo "  Build:       $Flavor"
     echo "  System Info: "
for Flavor in $Flavors ; do
     test_llvmCore 3 $Flavor $llvmCore_phase3_objdir
 
     ########################################################################
     # Compare .o files between Phase2 and Phase3 and report which ones
     # differ.
     if [ "$do_compare" = "yes" ]; then
         echo
         echo "# Comparing Phase 2 and Phase 3 files"
-        for o in `find $llvmCore_phase2_objdir -name '*.o'` ; do
-            p3=`echo $o | sed -e 's,Phase2,Phase3,'`
-            if ! cmp --ignore-initial=16 $o $p3 > /dev/null 2>&1 ; then
-                echo "file `basename $o` differs between phase 2 and phase 3"
+        for p2 in `find $llvmCore_phase2_objdir -name '*.o'` ; do
+            p3=`echo $p2 | sed -e 's,Phase2,Phase3,'`
+            # Substitute 'Phase2' for 'Phase3' in the Phase 2 object file in
+            # case there are build paths in the debug info.
+            if ! cmp --ignore-initial=16 <(sed -e 's,Phase2,Phase3,g' $p2) $p3 \
+                    > /dev/null 2>&1 ; then
+                echo "file `basename $p2` differs between phase 2 and phase 3"
             fi
         done
     fi
 done
 ) 2>&1 | tee $LogDir/testing.$Release-$RC.log
 
 package_release