[llvm-commits] [polly] r134512 - /polly/trunk/utils/pollycc

[Tobias Grosser]

Author: grosser
Date: Wed Jul  6 13:04:59 2011
New Revision: 134512

URL: http://llvm.org/viewvc/llvm-project?rev=134512&view=rev
Log:
pollycc: Fix error message if PoCC/Pluto are not available

Modified:
    polly/trunk/utils/pollycc

Modified: polly/trunk/utils/pollycc
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/utils/pollycc?rev=134512&r1=134511&r2=134512&view=diff
==============================================================================
--- polly/trunk/utils/pollycc (original)
+++ polly/trunk/utils/pollycc Wed Jul  6 13:04:59 2011
@@ -351,7 +351,7 @@
 
   subprocess.call(commandLine)
 
-def checkExecutables(pollyLib):
+def checkExecutables(pollyLib, pluto):
   commandLine = ['opt', '-load', pollyLib, '-help']
   try:
     proc = subprocess.Popen(commandLine, stdout=subprocess.PIPE,
@@ -361,8 +361,9 @@
     if not stdout_value.count('polly-prepare'):
       sys.exit('Polly support not available in opt')
 
-    if not stdout_value.count('polly-optimize'):
-      sys.exit('Polly compiled without POCC/Pluto support')
+    if pluto and not stdout_value.count('Optimize the scop using pocc'):
+      sys.exit('Polly compiled without POCC/Pluto support. -ftile and -fpluto'
+	       ' will not work.')
   except OSError:
     print 'error: opt cannot be executed: '
     print 'failing command: \n' + " ".join(commandLine)
@@ -393,7 +394,7 @@
 
   pollyLib = os.environ['LIBPOLLY']
 
-  checkExecutables(pollyLib)
+  checkExecutables(pollyLib, args.fpluto)
 
   assemblyFiles = createAssemblyFiles(args.files, args, pollyLib)
   createOutputFiles(assemblyFiles, args)