This is an archive of the discontinued LLVM Phabricator instance.

I'm testing focal bots for Linaro at the moment. Of course we'll be installing uuidgen to get this to work but let's make it obvious instead of going ahead and letting gfortran fail to find the file.

/home/tcwg-buildslave/worker/clang-aarch64-full-2stage/stage2.install/bin/flang          CMakeFiles/FM004.dir/FM004.f.o  -o FM004 
/home/tcwg-buildslave/worker/clang-aarch64-full-2stage/stage2.install/bin/flang: line 361: uuidgen: command not found
make[2]: Entering directory '/home/tcwg-buildslave/worker/clang-aarch64-full-2stage/test/sandbox/build'
/usr/bin/make -f Fortran/UnitTests/fcvs21_f95/CMakeFiles/FM819.dir/build.make Fortran/UnitTests/fcvs21_f95/CMakeFiles/FM819.dir/build
[  0%] Building Fortran object Fortran/UnitTests/fcvs21_f95/CMakeFiles/FM306.dir/FM306.f.o
gfortran: error: flang_unparsed_file__0.f90: No such file or directory
gfortran: fatal error: no input files
compilation terminated.

Harbormaster completed remote builds in B126286: Diff 375831.Sep 29 2021, 4:43 AM

Thanks for the improvement, LGTM! Added Steve as a reviewer - he's the only user of this script that I am aware of :) Shall we wait a day to see whether he's got any comments?

flang/tools/f18/flang
368–372	[nit] I would move this change above the comments (they only apply to L367 and L368). Perhaps add a quick justification explaining _why_ we need a check for this particular utility. It's already documented in the commit message, so perhaps that would be overkill?

This revision is now accepted and ready to land.Sep 29 2021, 5:36 AM

awarzynski added a reviewer: sscalpone.Sep 29 2021, 5:36 AM

Move check above comments.

Shall we wait a day to see whether he's got any comments?

Sure, this isn't blocking anything else.

Harbormaster completed remote builds in B126305: Diff 375853.Sep 29 2021, 6:17 AM

Closed by commit rG3780de46001b: [flang][driver] Error if uuidgen is not installed (authored by DavidSpickett). · Explain WhyOct 1 2021, 1:43 AM

This revision was automatically updated to reflect the committed changes.

DavidSpickett added a commit: rG3780de46001b: [flang][driver] Error if uuidgen is not installed.

Revision Contents

Path

Size

flang/

tools/

f18/

flang

7 lines

Diff 376448

flang/tools/f18/flang

Show First 20 Lines • Show All 347 Lines • ▼ Show 20 Lines	main() {
# driver mode).		# driver mode).
local flang_options=("-fc1")		local flang_options=("-fc1")
# Options for the external Fortran Compiler		# Options for the external Fortran Compiler
local ext_fc_options=()		local ext_fc_options=()
categorise_opts OPTIONS flang_options ext_fc_options		categorise_opts OPTIONS flang_options ext_fc_options

local -r wd=$(cd "$(dirname "$0")/.." && pwd)		local -r wd=$(cd "$(dirname "$0")/.." && pwd)

		# uuidgen is common but not installed by default on some distros
		if ! command -v uuidgen &> /dev/null
		then
		echo "uuidgen is required for generating unparsed file names."
		exit 1
		fi

# STEP 1: Unparse		# STEP 1: Unparse
# Base-name for the unparsed files. These are just temporary files that are		# Base-name for the unparsed files. These are just temporary files that are
# first generated and then deleted by this script.		# first generated and then deleted by this script.
# NOTE: We need to make sure that the base-name is unique to every		# NOTE: We need to make sure that the base-name is unique to every
# invocation. Otherwise we can't use this script in parallel.		# invocation. Otherwise we can't use this script in parallel.
local -r unique_id=$(uuidgen \| cut -b25-36)		local -r unique_id=$(uuidgen \| cut -b25-36)
local -r unparsed_file_base="flang_unparsed_file_$unique_id"		local -r unparsed_file_base="flang_unparsed_file_$unique_id"

flang_options+=("-module-suffix")		flang_options+=("-module-suffix")
flang_options+=(".f18.mod")		flang_options+=(".f18.mod")
		awarzynskiUnsubmitted Done Reply Inline Actions [nit] I would move this change above the comments (they only apply to L367 and L368). Perhaps add a quick justification explaining _why_ we need a check for this particular utility. It's already documented in the commit message, so perhaps that would be overkill? awarzynski: [nit] I would move this change above the comments (they only apply to L367 and L368). Perhaps…
flang_options+=("-fdebug-unparse")		flang_options+=("-fdebug-unparse")
flang_options+=("-fno-analyzed-objects-for-unparse")		flang_options+=("-fno-analyzed-objects-for-unparse")

[[ ! -z ${MODULE_DIR} ]] && flang_options+=("-module-dir ${MODULE_DIR}")		[[ ! -z ${MODULE_DIR} ]] && flang_options+=("-module-dir ${MODULE_DIR}")
[[ ! -z ${INTRINSICS_MOD_DIR} ]] && flang_options+=("-intrinsics-module-directory ${INTRINSICS_MOD_DIR}")		[[ ! -z ${INTRINSICS_MOD_DIR} ]] && flang_options+=("-intrinsics-module-directory ${INTRINSICS_MOD_DIR}")
for idx in "${!fortran_source_files[@]}"; do		for idx in "${!fortran_source_files[@]}"; do
set +e		set +e
"$wd/bin/flang-new" "${flang_options[@]}" "${fortran_source_files[$idx]}" -o "${unparsed_file_base}_${idx}.f90"		"$wd/bin/flang-new" "${flang_options[@]}" "${fortran_source_files[$idx]}" -o "${unparsed_file_base}_${idx}.f90"
▲ Show 20 Lines • Show All 80 Lines • Show Last 20 Lines

This is an archive of the discontinued LLVM Phabricator instance.

[flang][driver] Error if uuidgen is not installedClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents

Diff 376448

flang/tools/f18/flang

[flang][driver] Error if uuidgen is not installed
ClosedPublic