Remove dragonegg-based LLVM tests.

Author: rschatz

Diff for: sulong/ci/ci.jsonnet

@@ -67,7 +67,6 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     $.sulong + $.gate(standalone=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,sulongMisc,parser") + $.sulong_test_toolchain + { name: "gate-sulong-misc-parser-jdk-latest-linux-amd64" },
     $.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk-latest-linux-amd64", timelimit: "45:00" },
     $.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-linux-amd64", timelimit: "45:00" },
-    $.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,gcc_fortran") + { name: "gate-sulong-gcc_fortran-jdk-latest-linux-amd64" },
 
     $.sulong + $.gate() + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["ram16gb"] },
 

Diff for: sulong/ci/ci_common/sulong-common.jsonnet

@@ -188,16 +188,11 @@ local sulong_deps = common.deps.sulong;
     packages+: {
       gcc: "==6.1.0",
     },
-    downloads+: {
-      DRAGONEGG_GCC: { name: "gcc+dragonegg", version: "4.6.4-1", platformspecific: true },
-      DRAGONEGG_LLVM: { name: "clang+llvm", version: "3.2", platformspecific: true },
-    },
   },
 
   # like requireGCC, but only on linux/amd64, ignored otherwise
   optionalGCC:: {
     packages+: if self.os == "linux" && self.arch == "amd64" then $.requireGCC.packages else {},
-    downloads+: if self.os == "linux" && self.arch == "amd64" then $.requireGCC.downloads else {},
   },
 
   requireGMP:: {

Diff for: sulong/docs/contributor/TESTS.md

@@ -156,31 +156,6 @@ Another useful `mx unittest` flag is `--color`, which makes the output easier to
 To attach a debugger to Sulong tests, run `mx` with the `-d` argument, e.g.
 `mx -d unittest SulongSuite` or `mx -d gate --tags sulong`.
 
-## Fortran
-
-Some of our tests are Fortran files. Make sure you have GCC, G++, and GFortran
-in version 4.5, 4.6 or 4.7 available.
-
-On the Mac you can use Homebrew:
-
-    brew tap homebrew/versions
-    brew install gcc46 --with-fortran
-    brew link --force gmp4
-
-For the Fortran tests you also need to provide
-[DragonEgg](http://dragonegg.llvm.org/) 3.2 and Clang 3.2.
-
-[DragonEgg](http://dragonegg.llvm.org/) is a GCC plugin with which we
-can use GCC to compile a source language to LLVM IR. Sulong uses
-DragonEgg in its test cases to compile Fortran files to LLVM IR.
-Sulong also uses DragonEgg for the C/C++ test cases besides Clang to get
-additional "free" test cases for a given C/C++ file. DragonEgg requires
-a GCC in the aforementioned versions.
-
-- Sulong expects to find Clang 3.2 in `$DRAGONEGG_LLVM/bin`
-- Sulong expects to find GCC 4.5, 4.6 or 4.7 in `$DRAGONEGG_GCC/bin`
-- Sulong expects to find `dragonegg.so` under `$DRAGONEGG` or in `$DRAGONEGG_GCC/lib`
-
 ## Test Exclusion
 
 Not all tests work under all circumstances. Especially external test suites,

Diff for: sulong/mx.sulong/mx_sulong_gate.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -185,7 +185,6 @@ def _unittest(title, test_suite, tags=None, testClasses=None, unittestArgs=None,
     _unittest('GCCParserTorture', 'SULONG_PARSER_TORTURE', description="Parser test using GCC suite", testClasses=['ParserTortureSuite'], tags=['parser'])
     _unittest('GCC_C', 'SULONG_GCC_C_TEST_SUITE', description="GCC 5.2 test suite (C tests)", testClasses=['GccCSuite'], tags=['gcc_c'])
     _unittest('GCC_CPP', 'SULONG_GCC_CPP_TEST_SUITE', description="GCC 5.2 test suite (C++ tests)", testClasses=['GccCppSuite'], tags=['gcc_cpp'])
-    _unittest('GCC_Fortran', 'SULONG_GCC_FORTRAN_TEST_SUITE', description="GCC 5.2 test suite (Fortran tests)", testClasses=['GccFortranSuite'], tags=['gcc_fortran'])
     _unittest('Sulong', 'SULONG_STANDALONE_TEST_SUITES', description="Sulong's internal tests", testClasses='SulongSuite', tags=['sulongStandalone', 'sulongBasic', 'standalone'],
               # run only a small subset of the tests on the jvm standalone, the startup overhead per test is too high for more
               extraUnittestArgs=['-Dsulongtest.testNameFilter=cpp'] if slowStandalone else [])

Diff for: sulong/mx.sulong/mx_sulong_suite_constituents.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -75,60 +75,12 @@ def compileTestSuite(testsuiteproject, extra_build_args):
     mx.command_function('build')(defaultBuildArgs + extra_build_args)
 
 
-class DragonEggSupport:
-    """Helpers for DragonEgg
-
-    DragonEgg support is controlled by two environment variables:
-      * `DRAGONEGG_GCC`: path to a GCC installation with dragonegg support
-      * `DRAGONEGG_LLVM`: path to an LLVM installation that can deal with bitcode produced by DragonEgg
-      * `DRAGONEGG`: (optional) path to folder that contains the `libdragonegg.so`
-    """
-
-    @staticmethod
-    def haveDragonegg():
-        if not hasattr(DragonEggSupport, '_haveDragonegg'):
-            DragonEggSupport._haveDragonegg = DragonEggSupport.pluginPath() is not None and os.path.exists(
-                DragonEggSupport.pluginPath()) and DragonEggSupport.findGCCProgram('gcc', optional=True) is not None
-        return DragonEggSupport._haveDragonegg
-
-    @staticmethod
-    def pluginPath():
-        if 'DRAGONEGG' in os.environ:
-            return os.path.join(os.environ['DRAGONEGG'], mx.add_lib_suffix('dragonegg'))
-        if 'DRAGONEGG_GCC' in os.environ:
-            path = os.path.join(os.environ['DRAGONEGG_GCC'], 'lib', mx.add_lib_suffix('dragonegg'))
-            if os.path.exists(path):
-                return path
-        return None
-
-    @staticmethod
-    def findLLVMProgram(program, optional=False):
-        if 'DRAGONEGG_LLVM' in os.environ:
-            path = os.environ['DRAGONEGG_LLVM']
-            return os.path.join(path, 'bin', program)
-        if optional:
-            return None
-        mx.abort("Cannot find LLVM program for dragonegg: {}\nDRAGONEGG_LLVM environment variable not set".format(program))
-
-    @staticmethod
-    def findGCCProgram(gccProgram, optional=False):
-        if 'DRAGONEGG_GCC' in os.environ:
-            path = os.environ['DRAGONEGG_GCC']
-            return os.path.join(path, 'bin', gccProgram)
-        if optional:
-            return None
-        mx.abort("Cannot find GCC program for dragonegg: {}\nDRAGONEGG_GCC environment variable not set".format(gccProgram))
-
-
 class SulongTestSuiteMixin(object, metaclass=abc.ABCMeta):
 
     def getVariants(self):
         if not hasattr(self, '_variants'):
             self._variants = []
             for v in self.variants:
-                if 'gcc' in v and not DragonEggSupport.haveDragonegg():
-                    mx.warn('Could not find dragonegg, not building test variant "%s"' % v)
-                    continue
                 self._variants.append(v)
         return self._variants
 
@@ -311,14 +263,6 @@ def getBuildEnv(self, replaceVar=mx_subst.path_substitutions):
         env['GRAALVM_LLVM_HOME'] = mx_subst.path_substitutions.substitute("<path:SULONG_HOME>")
         if 'OS' not in env:
             env['OS'] = mx_subst.path_substitutions.substitute("<os>")
-        if DragonEggSupport.haveDragonegg():
-            env['DRAGONEGG'] = DragonEggSupport.pluginPath()
-            env['DRAGONEGG_GCC'] = DragonEggSupport.findGCCProgram('gcc', optional=False)
-            env['DRAGONEGG_LLVMAS'] = DragonEggSupport.findLLVMProgram("llvm-as")
-            env['DRAGONEGG_FC'] = DragonEggSupport.findGCCProgram('gfortran', optional=False)
-            env['FC'] = DragonEggSupport.findGCCProgram('gfortran', optional=False)
-        elif not self._is_needs_rebuild_call and getattr(self, 'requireDragonegg', False):
-            mx.abort('Could not find dragonegg, cannot build "{}" (requireDragonegg = True).'.format(self.name))
         return env
 
     def getTestFile(self):
@@ -525,8 +469,6 @@ class SulongCMakeTestSuite(SulongTestSuiteMixin, mx_cmake.CMakeNinjaProject):  #
                 The source file is compiled to an executable with an embedded bitcode section.
             - "toolchain"
                 The toolchain wrappers are used to compile the test source into an executable with embedded bitcode.
-            - "gcc"
-                The source is compiled to bitcode using gcc and the DRAGONEGG plugin.
         buildRef:
             If True (the default), build a reference executable. Setting this to False is useful for embedded tests with
             dedicated JUnit test classes.
@@ -597,13 +539,6 @@ def _default_cmake_vars(self):
         _config['LLVM_CONFIG'] = mx_sulong.findBundledLLVMProgram('llvm-config')
         _config['LLVM_OBJCOPY'] = mx_sulong.findBundledLLVMProgram('llvm-objcopy')
         _config['CMAKE_NM'] = mx_sulong.findBundledLLVMProgram('llvm-nm')
-        if DragonEggSupport.haveDragonegg():
-            _config['DRAGONEGG'] = DragonEggSupport.pluginPath()
-            _config['DRAGONEGG_GCC'] = DragonEggSupport.findGCCProgram('gcc', optional=False)
-            _config['DRAGONEGG_LLVM_LINK'] = DragonEggSupport.findLLVMProgram("llvm-link")
-            _config['DRAGONEGG_LLVMAS'] = DragonEggSupport.findLLVMProgram("llvm-as")
-            _config['DRAGONEGG_FC'] = DragonEggSupport.findGCCProgram('gfortran', optional=False)
-            _config['FC'] = DragonEggSupport.findGCCProgram('gfortran', optional=False)
         return _config
 
     def cmake_config(self):

Diff for: sulong/mx.sulong/suite.py

@@ -54,19 +54,6 @@
     },
     # Support Libraries.
     # Projects depending on these will *not be built* if the 'optional' is 'True' for the given OS/architecture.
-    # This is a dummy library for dragonegg support.
-    "DRAGONEGG_SUPPORT" : {
-      "os_arch" : {
-        "linux" : {
-          "amd64" : {
-            "path": "tests/support.txt",
-            "digest": "sha512:c02b248975b267f4200603ff2ae40b9d0cdefad4a792f386d610f2b14fb4e67e288c235fd11ed596dd8c91a3dae62fdd741bf97b5c01b5f085485f221702f0a1",
-          },
-          "<others>": {"optional": True},
-        },
-        "<others>": {"<others>" : {"optional": True}},
-      },
-    },
     # This is a dummy library for malloc.h support.
     "MALLOC_H_SUPPORT" : {
       "os_arch" : {
@@ -1119,7 +1106,7 @@
     "com.oracle.truffle.llvm.tests.sulong.native" : {
       "subDir" : "tests",
       "class" : "SulongCMakeTestSuite",
-      "variants" : ["bitcode-O0", "bitcode-O1", "bitcode-O2", "bitcode-O3", "gcc-O0"],
+      "variants" : ["bitcode-O0", "bitcode-O1", "bitcode-O2", "bitcode-O3"],
       "dependencies" : ["SULONG_TEST"],
       "testProject" : True,
       "defaultBuild" : False,
@@ -1534,28 +1521,6 @@
       "testProject" : True,
       "defaultBuild" : False,
     },
-    "gcc_fortran" : {
-      "subDir" : "tests/gcc",
-      # The Ninja generator used by mx (version 1.8.2) does not support Fortran using Ninja version [GR-30808]
-      # "class" : "ExternalCMakeTestSuite",
-      # "variants" : ["executable-O0"],
-      "class" : "ExternalTestSuite",
-      "variants" : ["O0_OUT"],
-      "testDir" : "gcc-5.2.0/gcc/testsuite",
-      "fileExts" : [".f90", ".f", ".f03"],
-      "requireDragonegg" : True,
-      "native" : True,
-      "vpath" : True,
-      "single_job" : True, # problem with parallel builds and temporary module files
-      "buildRef" : True,
-      "dependencies" : ["SULONG_TEST"],
-      "buildDependencies" : [
-        "GCC_SOURCE",
-        "DRAGONEGG_SUPPORT",
-      ],
-      "testProject" : True,
-      "defaultBuild" : False,
-    },
     "parserTorture" : {
       "subDir" : "tests/gcc",
       "class" : "ExternalCMakeTestSuite",
@@ -2271,16 +2236,6 @@
       "testDistribution" : True,
       "defaultBuild" : False,
     },
-    "SULONG_GCC_FORTRAN_TEST_SUITE" : {
-      "native" : True,
-      "relpath" : True,
-      "platformDependent" : True,
-      "layout" : {
-        "./" : ["dependency:gcc_fortran/*"],
-      },
-      "testDistribution" : True,
-      "defaultBuild" : False,
-    },
     "SULONG_PARSER_TORTURE" : {
       "native" : True,
       "relpath" : True,

Diff for: sulong/tests/Makefile.common

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -166,12 +166,6 @@ endif
 	@mkdir -p $(shell dirname $@)
 	$(QUIETLY) $(FC) -w -J$(shell dirname $@) $(CPPFLAGS) $(FFLAGS) $(LDFLAGS) -g -o $@ $^
 
-%.bc: %.dragonegg.ll
-	$(QUIETLY) $(DRAGONEGG_LLVMAS) -o $@ $<
-
-%/gcc_O0.bc: %/gcc_O0.ll
-	$(QUIETLY) $(DRAGONEGG_LLVMAS) -o $@ $<
-
 %_MEM2REG.bc: %.bc
 	$(QUIETLY) $(OPT) -o $@ -passes=mem2reg $<
 
@@ -213,31 +207,10 @@ define OPT_RULES
 	@mkdir -p $$(shell dirname $$@)
 	$(QUIETLY) $(CLANGXX) -c -emit-llvm $(2) -Wall -Wextra -Werror -Wno-unused-command-line-argument $(CPPFLAGS) $(CXXFLAGS) -g -o $$@ $$<
 
-%.f.dir/$(1).dragonegg.ll: %.f
-	@mkdir -p $$(shell dirname $$@)
-	$(QUIETLY) $(DRAGONEGG_FC) -w -S -fplugin=$(DRAGONEGG) -fplugin-arg-dragonegg-emit-ir -$(1) -J$$(shell dirname $$@) $(CPPFLAGS) $(FFLAGS) -o $$@ $$<
-
-%.f90.dir/$(1).dragonegg.ll: %.f90
-	@mkdir -p $$(shell dirname $$@)
-	$(QUIETLY) $(DRAGONEGG_FC) -w -S -fplugin=$(DRAGONEGG) -fplugin-arg-dragonegg-emit-ir -$(1) -J$$(shell dirname $$@) $(CPPFLAGS) $(FFLAGS) -o $$@ $$<
-
-%.f03.dir/$(1).dragonegg.ll: %.f03
-	@mkdir -p $$(shell dirname $$@)
-	$(QUIETLY) $(DRAGONEGG_FC) -w -S -fplugin=$(DRAGONEGG) -fplugin-arg-dragonegg-emit-ir -$(1) -J$$(shell dirname $$@) $(CPPFLAGS) $(FFLAGS) -o $$@ $$<
-
-%.c.dir/gcc_$(1).ll: %.c
-	@mkdir -p $$(shell dirname $$@)
-	$(QUIETLY) $(DRAGONEGG_GCC) -w -S --std=gnu99 -fplugin=$(DRAGONEGG) -fplugin-arg-dragonegg-emit-ir -$(1) $(CPPFLAGS) $(CFLAGS) -o $$@ $$<
-
 %.ll.dir/$(1).bc: %.ll
 	@mkdir -p $$(shell dirname $$@)
 	$(QUIETLY) $(LLVM_LINK) -o $$@ $$^
 
-%.c.dir/gcc_$(1).ll: %.c
-	@mkdir -p $$(shell dirname $$@)
-	$(QUIETLY) $(DRAGONEGG_GCC) -w -S --std=gnu99 -fplugin=$(DRAGONEGG) -fplugin-arg-dragonegg-emit-ir -$(1) $(CPPFLAGS) $(CFLAGS) -o $$@ $$<
-
-
 %.c.dir/$(1)_OUT.bc: %.c
 	@mkdir -p $$(shell dirname $$@)
 	$(QUIETLY) $(CLANG) $(EMBED_BC) $(2) -Wall -Wextra -Werror -Wno-unused-command-line-argument $(CPPFLAGS) $(CFLAGS) -g $(LDFLAGS) -o $$@ $$<

Diff for: sulong/tests/com.oracle.truffle.llvm.tests.cmake/SulongTestSuite.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -91,14 +91,6 @@ set(LLVM_AS "" CACHE STRING "LLVM bitcode assembler")
 set(LLVM_OPT "" CACHE STRING "LLVM opt tool")
 set(LLVM_OBJCOPY "" CACHE STRING "llvm-objcopy (for native object files like elf)")
 set(LLVM_CONFIG "" CACHE STRING "llvm-config utility for setting up library paths")
-set(DRAGONEGG "" CACHE STRING "DRAGONEGG plugin path")
-set(DRAGONEGG_GCC "" CACHE STRING "DRAGONEGG enabled gcc")
-set(DRAGONEGG_FC "" CACHE STRING "DRAGONEGG enabled Fortran compiler")
-set(DRAGONEGG_LLVM_LINK "" CACHE STRING "llvm-link compatible with the DRAGONEGG LLVM version")
-set(DRAGONEGG_LLVMAS "" CACHE STRING "llvm-as compatible with the DRAGONEGG LLVM version")
-# not set by default
-set(TOOLCHAIN_CLANG "" CACHE STRING "Toolchain Wrapper for clang used by the 'bitcode' variant")
-set(TOOLCHAIN_CLANGXX "" CACHE STRING "Toolchain Wrapper for clang++ used by the 'bitcode' variant")
 
 if(WIN32)
     # On Windows this defaults to 260 and produces a lot of warnings

Diff for: sulong/tests/com.oracle.truffle.llvm.tests.cmake/SulongTestSuiteVariantExecutable.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -38,29 +38,10 @@ macro(setupCompiler)
     setCompilerConfig(CMAKE_CXX_COMPILER ${CLANGXX})
     # reset in order to create a log message
     setCompilerConfig(LLVM_OBJCOPY ${LLVM_OBJCOPY})
-    if("Fortran" IN_LIST SULONG_ENABLED_LANGUAGES)
-        requireVariable(DRAGONEGG)
-        requireVariable(DRAGONEGG_FC)
-        setCompilerConfig(DRAGONEGG_FC ${DRAGONEGG_FC})
-        setCompilerConfig(DRAGONEGG ${DRAGONEGG})
-        setCompilerConfig(CMAKE_Fortran_COMPILER ${DRAGONEGG_FC})
-    endif()
 endmacro()
 
 macro(targetPostProcess SOURCE TARGET OUTPUT_DIR OUTPUT)
     get_source_file_property(TARGET_LANG ${SOURCE} LANGUAGE)
-    if(${TARGET_LANG} STREQUAL "Fortran")
-        set(TARGET_LL "${TARGET}.dragonegg.ll")
-        # create a bitcode target
-        add_library(${TARGET_LL} STATIC ${SOURCE})
-        target_compile_options(${TARGET_LL} PRIVATE "-S" "-fplugin=${DRAGONEGG}" "-fplugin-arg-dragonegg-emit-ir")
-        set_target_properties(${TARGET_LL} PROPERTIES Fortran_MODULE_DIRECTORY ${OUTPUT_DIR}/${OUTPUT}.dragonegg.ll.mod)
-        # postprocess to add the bitcode to the target file via objcopy
-        add_custom_command(
-          TARGET ${TARGET} POST_BUILD
-          COMMAND ${LLVM_OBJCOPY} "--add-section" ".llvmbc=$<TARGET_FILE:${TARGET_LL}>" "$<TARGET_FILE:${TARGET}>"
-        )
-    endif()
 endmacro()
 
 macro(setupOptions)