Merge pull request travitch#57 from SRI-CSL/master

-emit-llvm fix

Author: ianamason

.pylintrc

@@ -369,7 +369,7 @@ max-attributes=20
 min-public-methods=0
 
 # Maximum number of public methods for a class (see R0904).
-max-public-methods=20
+max-public-methods=30
 
 # Maximum number of boolean expressions in a if statement
 max-bool-expr=10

Makefile

@@ -58,7 +58,6 @@ check_clang:
 check_dragonegg:
 	cd test; python -m unittest -v test_base_driver test_dragonegg_driver
 
-
 zippity:
 	rm -rf doczip*; mkdir doczip;
 	cat README.md | pandoc -f markdown_github > doczip/index.html

test/test_files/Makefile

@@ -4,17 +4,39 @@
 zero:
 	${CXX} hello.cc -o hello
 
+zero_e:
+	${CXX} hello.cc -emit-llvm -c
+	${CXX} hello.bc -o hello
+
+
+e:
+	${CC} -emit-llvm  foo.c  -c
+	${CC} -emit-llvm  bar.c  -c
+	${CC} -emit-llvm  baz.c -c
+	${CC} -emit-llvm  main.c -c
+	${CC} foo.bc bar.bc baz.bc main.bc -o main
+
+
 one:
 	${CC} foo.c bar.c baz.c main.c -o main
 
 two:
 	${CC} foo.c bar.c baz.c main.c -c
 	${CC} foo.o bar.o baz.o main.o -o main
 
+two_e:
+	${CC} -emit-llvm  foo.c bar.c baz.c main.c -c
+	${CC} foo.bc bar.bc baz.bc main.bc -o main
+
 mix:
 	${CC} foo.c bar.c -c
 	${CC} foo.o bar.o baz.c main.c -o main
 
+mix_e:
+	${CC} -emit-llvm foo.c bar.c -c
+	${CC} foo.bc bar.bc baz.c main.c -o main
+
+
 objects:
 	${CC} foo.c -c
 	${CC} bar.c -c

wllvm/arglistfilter.py

@@ -50,7 +50,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
 
 
             #iam: if this happens, then we need to stop and think.
-            '-emit-llvm' : (0, ArgumentListFilter.abortUnaryCallback),
+            '-emit-llvm' : (0, ArgumentListFilter.emitLLVMCallback),
 
             #iam: buildworld and buildkernel use these flags
             '-pipe' : (0, ArgumentListFilter.compileUnaryCallback),
@@ -212,7 +212,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
         # - optimiziation and other flags: -f...
         #
         defaultArgPatterns = {
-            r'^.+\.(c|cc|cpp|C|cxx|i|s|S)$' : (0, ArgumentListFilter.inputFileCallback),
+            r'^.+\.(c|cc|cpp|C|cxx|i|s|S|bc)$' : (0, ArgumentListFilter.inputFileCallback),
             #iam: the object file recogition is not really very robust, object files
             # should be determined by their existance and contents...
             r'^.+\.(o|lo|So|so|po|a|dylib)$' : (0, ArgumentListFilter.objectFileCallback),
@@ -226,6 +226,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             r'^-Wl,.+$' : (0, ArgumentListFilter.linkUnaryCallback),
             r'^-W(?!l,).*$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-f.+$' : (0, ArgumentListFilter.compileUnaryCallback),
+            r'^-rtlib=.+$' : (0, ArgumentListFilter.linkUnaryCallback),
             r'^-std=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-stdlib=.+$' : (0, ArgumentListFilter.compileLinkUnaryCallback),
             r'^-mtune=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
@@ -252,6 +253,8 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
         self.isAssembleOnly = False
         self.isAssembly = False
         self.isCompileOnly = False
+        self.isEmitLLVM = False
+
 
         argExactMatches = dict(defaultArgExactMatches)
         argExactMatches.update(exactMatches)
@@ -339,6 +342,11 @@ def compileOnlyCallback(self, flag):
         _logger.debug('compileOnlyCallback: %s', flag)
         self.isCompileOnly = True
 
+    def emitLLVMCallback(self, flag):
+        _logger.debug('emitLLVMCallback: %s', flag)
+        self.isEmitLLVM = True
+        self.isCompileOnly = True
+
     def linkUnaryCallback(self, flag):
         _logger.debug('linkUnaryCallback: %s', flag)
         self.linkArgs.append(flag)
@@ -411,11 +419,10 @@ def getArtifactNames(self, srcFile, hidden=False):
 
     #iam: for printing our partitioning of the args
     def dump(self):
-        _logger.debug('compileArgs: %s\ninputFiles: %s\nlinkArgs: %s',
-                      self.compileArgs, self.inputFiles, self.linkArgs)
-        _logger.debug('objectFiles: %s\noutputFilename: %s',
-                      self.objectFiles, self.outputFilename)
+        efn = sys.stderr.write
+        efn('\ncompileArgs: {0}\ninputFiles: {1}\nlinkArgs: {2}\n'.format(self.compileArgs, self.inputFiles, self.linkArgs))
+        efn('\nobjectFiles: {0}\noutputFilename: {1}\n'.format(self.objectFiles, self.outputFilename))
         for srcFile in self.inputFiles:
-            _logger.debug('srcFile: %s', srcFile)
+            efn('\nsrcFile: {0}\n'.format(srcFile))
             (objFile, bcFile) = self.getArtifactNames(srcFile)
-            _logger.debug('%s ===> (%s, %s)', srcFile, objFile, bcFile)
+            efn('\n{0} ===> ({1}, {2})\n'.format(srcFile, objFile, bcFile))

wllvm/compilers.py

@@ -28,11 +28,10 @@ def wcompile(isCXX):
         builder = getBuilder(cmd, isCXX)
         rc = buildObject(builder)
 
-
         if rc == 0 and not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
             buildAndAttachBitcode(builder)
     except Exception as e:
-        _logger.debug('wllvm++: exception case: %s', str(e))
+        _logger.debug('%s: exception case: %s', "wllvm++" if isCXX else "wllvm", str(e))
 
     return rc
 
@@ -141,7 +140,7 @@ def __init__(self, cmd, isCxx, prefixPath=None):
         else:
             self.prefixPath = ''
 
-    #clang and drogonegg share the same taste in bitcode filenames.
+    #clang and dragonegg share the same taste in bitcode filenames.
     def getBitcodeFileName(self, argFilter):
         (dirs, baseFile) = os.path.split(argFilter.getOutputFilename())
         bcfilename = os.path.join(dirs, '.{0}.bc'.format(baseFile))
@@ -252,7 +251,7 @@ def buildAndAttachBitcode(builder):
 
     af = builder.getBitcodeArglistFilter()
 
-    if len(af.inputFiles) == 0 or af.isAssembly or af.isAssembleOnly or (af.isDependencyOnly and not af.isCompileOnly) or af.isPreprocessOnly:
+    if len(af.inputFiles) == 0 or af.isEmitLLVM or af.isAssembly or af.isAssembleOnly or (af.isDependencyOnly and not af.isCompileOnly) or af.isPreprocessOnly:
         _logger.debug('No work to do')
         _logger.debug(af.__dict__)
         return
@@ -281,12 +280,19 @@ def buildAndAttachBitcode(builder):
     else:
 
         for srcFile in af.inputFiles:
+            _logger.debug('Not compile only case: %s', srcFile)
             (objFile, bcFile) = af.getArtifactNames(srcFile, hidden)
             if hidden:
                 buildObjectFile(builder, srcFile, objFile)
                 newObjectFiles.append(objFile)
-            buildBitcodeFile(builder, srcFile, bcFile)
-            attachBitcodePathToObject(bcFile, objFile)
+
+            if srcFile.endswith('.bc'):
+                _logger.debug('attaching %s to %s', srcFile, objFile)
+                attachBitcodePathToObject(srcFile, objFile)
+            else:
+                _logger.debug('building and attaching %s to %s', bcFile, objFile)
+                buildBitcodeFile(builder, srcFile, bcFile)
+                attachBitcodePathToObject(bcFile, objFile)
 
 
     if not af.isCompileOnly:

wllvm/wllvm.py

@@ -16,7 +16,7 @@
 
 
 def main():
-    """ The entry point to wllvm++.
+    """ The entry point to wllvm.
     """
     return wcompile(False)