Explicitly import TRUFFLE_NFI when needed

Author: zapster

mx.graalpython/mx_graalpython.py

@@ -111,7 +111,7 @@ def do_run_python(args, extra_vm_args=None, env=None, jdk=None, **kwargs):
         elif check_vm_env == '0':
             check_vm()
 
-    dists = ['GRAALPYTHON']
+    dists = ['GRAALPYTHON', 'TRUFFLE_NFI']
 
     vm_args, graalpython_args = mx.extract_VM_args(args, useDoubleDash=True, defaultAllVMArgs=False)
     graalpython_args, additional_dists = _extract_graalpython_internal_options(graalpython_args)

mx.graalpython/mx_graalpython_benchmark.py

@@ -209,7 +209,7 @@ def run(self, cwd, args):
             # '-Dgraal.TruffleCompilationExceptionsAreFatal=true'
         ]
 
-        dists = ["GRAALPYTHON", "GRAALPYTHON-LAUNCHER"]
+        dists = ["GRAALPYTHON", "TRUFFLE_NFI", "GRAALPYTHON-LAUNCHER"]
         # add configuration specified distributions
         if self._distributions:
             assert isinstance(self._distributions, list), "distributions must be either None or a list"