WiP: Support derived types and make kernels look more like original Fortran code

.gitignore

@@ -5,5 +5,11 @@ __pycache__
 *.kernels.f08
 *.kernels.hip.cpp
 *.hipified.*
+*-gpufort.cpp
+*-gpufort.f*
+*-fort2x.cpp
+*-fort2x.f*
 gpufort.h
 gpufort_reductions.h
+render*.template.*
+render.py.in

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2020-2022 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,35 +1,47 @@
-.PHONY: clean_all gpufort_headers gpufort_sources lib/$(LIBGPUFORT) lib/$(LIBGPUFORT_ACC)
+.PHONY: clean_all gpufort_headers gpufort_sources gpufort_templates share/gpufort_sources lib/$(LIBGPUFORT) lib/$(LIBGPUFORTRT)
 
-SUFFIX         = $(if $(HIP_PLATFORM),$(HIP_PLATFORM),amd)
-LIBGPUFORT     = libgpufort_$(SUFFIX).a
-LIBGPUFORT_ACC = libgpufort_acc_$(SUFFIX).a
+SUFFIX       = $(if $(HIP_PLATFORM),$(HIP_PLATFORM),amd)
+LIBGPUFORT   = libgpufort_$(SUFFIX).a
+LIBGPUFORTRT = libgpufortrt_$(SUFFIX).a
 
-GPUFORT_DIR     = $(shell gpufort --path)
-GPUFORT_ACC_DIR = $(GPUFORT_DIR)/runtime/gpufort_acc_runtime
+GPUFORT_DIR     = .
+GPUFORTRT_DIR = $(GPUFORT_DIR)/runtime/gpufortrt
 
-all: | gpufort_headers lib/$(LIBGPUFORT) lib/$(LIBGPUFORT_ACC) make_directories
+all: | gpufort_templates lib/$(LIBGPUFORT) lib/$(LIBGPUFORTRT) make_directories
+
+gpufort_templates:
+	make -C $(GPUFORT_DIR)/python/gpufort/fort2x/templates all
+	make -C $(GPUFORT_DIR)/python/gpufort/fort2x/hip/templates all
 
 gpufort_headers:
 	make -C $(GPUFORT_DIR)/include all
 
 gpufort_sources:
 	make -C $(GPUFORT_DIR)/src gpufort_sources
 
-lib/$(LIBGPUFORT): | gpufort_headers gpufort_sources make_directories
+share/gpufort_sources: gpufort_headers gpufort_sources
+	cp src/gpufort.f03 share/gpufort_sources
+	cp src/gpufort_array.cpp share/gpufort_sources
+	cp src/gpufort_array.f03 share/gpufort_sources
+	cp include/gpufort.h share/gpufort_sources
+	cp include/gpufort_array.h share/gpufort_sources
+	cp include/gpufort_reduction.h share/gpufort_sources
+
+lib/$(LIBGPUFORT): | gpufort_templates gpufort_headers gpufort_sources make_directories
 	make -C $(GPUFORT_DIR)/src $(LIBGPUFORT)
 	mv $(GPUFORT_DIR)/src/$(LIBGPUFORT) $(GPUFORT_DIR)/lib
 	mv $(GPUFORT_DIR)/src/*.mod $(GPUFORT_DIR)/include/$(SUFFIX)/
 	make -C $(GPUFORT_DIR)/src clean
 
-lib/$(LIBGPUFORT_ACC): make_directories
-	make -C $(GPUFORT_ACC_DIR)/ lib/$(LIBGPUFORT_ACC)
-	mv $(GPUFORT_ACC_DIR)/lib/$(LIBGPUFORT_ACC)\
+lib/$(LIBGPUFORTRT): | gpufort_templates make_directories
+	make -C $(GPUFORTRT_DIR)/ clean_all build clean
+	mv $(GPUFORTRT_DIR)/lib/$(LIBGPUFORTRT)\
 	    $(GPUFORT_DIR)/lib/
-	mv $(GPUFORT_ACC_DIR)/include/*.mod\
+	mv $(GPUFORTRT_DIR)/include/*.mod\
 	    $(GPUFORT_DIR)/include/$(SUFFIX)/
-	#-mv $(GPUFORT_ACC_DIR)/include/*.h\
+	#-mv $(GPUFORTRT_DIR)/include/*.h\
 	#   $(GPUFORT_DIR)/include/$(SUFFIX)
-	make -C $(GPUFORT_ACC_DIR)/ clean
+	make -C $(GPUFORTRT_DIR)/ clean
 
 make_directories:
 	mkdir -p $(GPUFORT_DIR)/lib
@@ -38,4 +50,6 @@ make_directories:
 clean_all:
 	make -C $(GPUFORT_DIR)/include clean_all
 	make -C $(GPUFORT_DIR)/src     clean_all
-	rm -f lib/$(LIBGPUFORT) lib/$(LIBGPUFORT_ACC)
+	make -C $(GPUFORT_DIR)/python/gpufort/fort2x/templates clean_all
+	make -C $(GPUFORT_DIR)/python/gpufort/fort2x/hip/templates clean_all
+	rm -f lib/$(LIBGPUFORT) lib/$(LIBGPUFORTRT)

README.md

@@ -32,11 +32,17 @@ build the GPUFORT static libraries and/or
 offloading runtime for AMD and/or NVIDIA devices.
 Assuming HIPFORT is installed, you can compile them via:
 
+NOTE: The project uses `hipfort`. If you are not using the AMD flang compiler, it is recommended to build it from source so that the `hipfort` `*.mod` files are compatible with your compiler.
+
 ```bash
-HIP_PLATFORM=amd FC=hipfc make all # use HIP_PLATFORM=nvidia for NVIDIA devices
+HIP_PLATFORM=amd FC=hipfc make clean_all all # use HIP_PLATFORM=nvidia for NVIDIA devices
+
+# or without hipfc:
+
+FC="/opt/rocm/bin/flang" HIPFORT_INC="/opt/rocm/include/hipfort/amdgcn" HIP_PLATFORM="amd" make clean_all all
 ```
 
-If the compilation is successful, take a look at the 
+After compiling successfully, take a look at the 
 CUDA Fortran and OpenACC examples in the `examples/` subdirectory,
 which all come with a Makefile for generating code and building
 the examples.

bin/gpufort

@@ -1,29 +1,10 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: MIT                                                 
-# Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
-# check if required software installed
+# Copyright (c) 2020-2022 Advanced Micro Devices, Inc. All rights reserved.
 GPUFORT_BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-declare -i retval
-requirements=$(grep -v "^\s*#" $GPUFORT_BIN_DIR/../os-requirements.txt | grep "^\w\+")
-for p in $requirements; do 
-  command -v $p > /dev/null
-  retval=$(echo $?)
-  if (( retval > 0 )); then
-    echo "ERROR: Could not find program '$p'. Please install or add to path."
-    exit 10
-  fi
-done
-
-declare -i clang_format_version # major version
-clang_format_version=$(clang-format --version | grep -o "clang-format version [0-9]\+\.[0-9]\+\.[0-9]\+" | grep -o "\s\+[0-9]\+")
-if (( clang_format_version < 7 )); then
-  echo "ERROR: Minimum required clang-format version is 7.0.0"
-  exit 11
-fi
-
 # check if required python packages are installed
-requirements=$(grep -v "^\s*#" $GPUFORT_BIN_DIR/../python3-requirements.txt | grep "^\w\+")
+requirements=$(grep -v "^\s*#" $GPUFORT_BIN_DIR/../python/requirements.txt | grep "^\w\+")
 declare -i requirements_missing 
 requirements_missing=0 # 0: 'false', >0: true
 for m in $requirements; do 
@@ -36,7 +17,7 @@ for m in $requirements; do
 done
 if (( requirements_missing > 0 )); then
   echo "Please install missing python3 packages e.g. via:"
-  echo "python3 -m pip install -r <gpufort_root>/python3-requirements.txt"
+  echo "python3 -m pip install -r ${GPUFORT_BIN_DIR}/../python/requirements.txt"
   echo "(you might need to be root)"
   exit 20
 fi
@@ -63,5 +44,5 @@ for a in "$@"; do
 done 
 
 if [ -z ${USED_DEVELOPER_TOOL} ]; then
-  python3 $GPUFORT_BIN_DIR/../python/gpufort.py --working-dir $(pwd) "${@}"
-fi
+  python3 $GPUFORT_BIN_DIR/../python/converter.py --working-dir $(pwd) "${@}" ${GPUFORT_FLAGS_APPEND}
+fi

bin/gpufortfc

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: MIT                                                 
+# Copyright (c) 2020-2022 Advanced Micro Devices, Inc. All rights reserved.
+# check if required software installed
+GPUFORT_BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# check if required python packages are installed
+requirements=$(grep -v "^\s*#" $GPUFORT_BIN_DIR/../python/requirements.txt | grep "^\w\+")
+declare -i requirements_missing 
+requirements_missing=0 # 0: 'false', >0: true
+for m in $requirements; do 
+  python3 -c "import $m" &> /dev/null
+  retval="$(echo $?)"
+  requirements_missing="$requirements_missing + $retval" 
+  if (( retval > 0 )); then
+    echo "ERROR: Could not find python3 module '$m'. Please install or add to path."
+  fi
+done
+if (( requirements_missing > 0 )); then
+  echo "Please install missing python3 packages e.g. via:"
+  echo "python3 -m pip install -r ${GPUFORT_BIN_DIR}/../python/requirements.txt"
+  echo "(you might need to be root)"
+  exit 20
+fi
+
+# all dependencies are met and we can continue
+
+if [ -z ${USED_DEVELOPER_TOOL} ]; then
+  python3 $GPUFORT_BIN_DIR/../python/fc.hip.py --working-dir $(pwd) "${@}" ${GPUFORTFC_FLAGS_APPEND}
+fi

config/dynamico.py.in

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT                                                
-# Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) 2020-2022 Advanced Micro Devices, Inc. All rights reserved.
 ###############################################################################
 # config file for dynamico (python script)
 ###############################################################################
@@ -33,10 +33,10 @@ scanner.HIP_MATH_MODULE_PREFIX = scanner.HIP_MODULE_NAME+"_"
 scanner.ACC_DEV_PREFIX=""
 scanner.ACC_DEV_SUFFIX="_d"
 
-translator.FORTRAN_2_C_TYPE_MAP["complex"]["cstd"] = "hipDoubleComplex"
-translator.FORTRAN_2_C_TYPE_MAP["complex"]["rstd"] = "hipDoubleComplex"
-translator.FORTRAN_2_C_TYPE_MAP["real"]["rstd"]    = "double"
-translator.FORTRAN_2_C_TYPE_MAP["complex"]["istd"] = "int"
+translator.fortran_2_c_type_map["complex"]["cstd"] = "hipDoubleComplex"
+translator.fortran_2_c_type_map["complex"]["rstd"] = "hipDoubleComplex"
+translator.fortran_2_c_type_map["real"]["rstd"]    = "double"
+translator.fortran_2_c_type_map["complex"]["istd"] = "int"
 
 translator.LOOP_COLLAPSE_STRATEGY="collapse-always"