first version f tests for parser module

parser/fpc-debug

@@ -0,0 +1 @@
+/usr/workspace/wsa/laguna/fpchecker/FPChecker/parser/fpc-debug.py

parser/fpc-debug.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python3
+
+import sys
 import os
 
 def getLogFiles() -> list:
@@ -26,11 +29,15 @@ def report(fileList: list):
         elif line.startswith('Failed:'):
           failed += 1
 
-  print('*** FPChcecker Report ***')
+  print('===== FPChcecker Report =====')
   print('Instrumented files:', inst)
   print('Failed:', failed)
 
 if __name__ == '__main__':
   fileList = getLogFiles()
-  #removeFiles(fileList)
-  report(fileList)
+
+  if len(sys.argv) > 1:
+    if sys.argv[1] == '-r':
+      removeFiles(fileList)
+  else:
+    report(fileList)

parser/instrument.py

@@ -7,7 +7,7 @@
 from match import Match
 from match import FunctionType
 from deprocess import Deprocess
-from logging import verbose, logMessage
+from fpc_logging import verbose, logMessage
 
 ## Assumes we already pre-processed the file
 class Instrument:

parser/match.py

@@ -2,7 +2,7 @@
 import sys
 import enum
 from tokenizer import Tokenizer, Token, SymbolToken, KeywordToken, WhiteSpaceToken, IdentifierToken
-from logging import verbose, logMessage
+from fpc_logging import verbose, logMessage
 
 #--------------------------------------------------------------------#
 # Types                                                              #

parser/nvcc_fpchecker.py

@@ -7,7 +7,7 @@
 from colors import prGreen, prCyan, prRed
 from instrument import Instrument
 from exceptions import CommandException, CompileException, EmptyFileException
-from logging import logMessage, verbose
+from fpc_logging import logMessage, verbose
 
 # --------------------------------------------------------------------------- #
 # --- Installation Paths ---------------------------------------------------- #
@@ -190,17 +190,17 @@ def compileInstrumentedFile(self):
       cmd.instrumentSource()
       cmd.compileInstrumentedFile()
       logMessage('Instrumented: ' + cmd.instrumentedFile)
-    except EmptyFileException as e:
+    except Exception as e: # Fall back to original command
       if verbose():
         logMessage(str(e))
-        prRed(e)
+        prRed(e)     
+      if not isinstance(e, EmptyFileException):
         logMessage('Failed: ' + ' '.join(sys.argv))
+      else:
+          if verbose():
+            logMessage('Failed: ' + ' '.join(sys.argv))
       cmd.executeOriginalCommand()
-    except Exception as e:
-      # Fall back to original command
-      if verbose():
-        logMessage(str(e))
-        prRed(e)
-      logMessage('Failed: ' + ' '.join(sys.argv))
-      cmd.executeOriginalCommand()
+
+
+
 

parser/tokenizer.py

@@ -4,7 +4,7 @@
 import re
 import tempfile
 from exceptions import MatchException, EmptyFileException
-from logging import verbose, logMessage
+from fpc_logging import verbose, logMessage
 
 # Lookahead tokens: 1
 CPP_SYMBOL_L1 = set([

tests/parser/static/test_compile_derived_types/test_compile_derived_types.py

@@ -1,11 +1,11 @@
-
+import pathlib
 import sys
 import subprocess
 
 sys.path.insert(1, '/usr/workspace/wsa/laguna/fpchecker/FPChecker/parser')
 from tokenizer import Tokenizer
 
-FILENAME = "simple.cu"
+FILENAME = str(pathlib.Path(__file__).parent.absolute()) + "/simple.cu"
 
 def test_1():
 

tests/parser/static/test_deprocess_empty/test_deprocess_empty.py

@@ -1,13 +1,15 @@
-
+import pathlib
 import sys
 
 sys.path.insert(1, '/usr/workspace/wsa/laguna/fpchecker/FPChecker/parser')
 from deprocess import Deprocess
 from instrument import Instrument
-from exceptions import MatchException
+from exceptions import EmptyFileException
+
+FILE_PATH = str(pathlib.Path(__file__).parent.absolute())
 
-SOURCE = "MemUtils_HIP.cpp"
-PRE_PROCESSED = "MemUtils_HIP.cpp.o.ii"
+SOURCE = FILE_PATH + "/MemUtils_HIP.cpp"
+PRE_PROCESSED = FILE_PATH + "/MemUtils_HIP.cpp.o.ii"
 
 def test_1():
   # This should produce an exception since the
@@ -19,7 +21,7 @@ def test_1():
     inst = Instrument(preFileName, sourceFileName)
     inst.deprocess()
     inst.findDeviceDeclarations()
-  except MatchException:
+  except EmptyFileException:
     got_exception = True
 
   assert got_exception

tests/parser/static/test_end_of_file/test_end_of_file.py

@@ -1,10 +1,10 @@
-
+import pathlib
 import sys
 
 sys.path.insert(1, '/usr/workspace/wsa/laguna/fpchecker/FPChecker/parser')
 from tokenizer import Tokenizer
 
-FILENAME = "simple.cu"
+FILENAME = str(pathlib.Path(__file__).parent.absolute()) + "/simple.cu"
 
 def test_1():
   l = Tokenizer(FILENAME)

tests/parser/static/test_tokenize_chars/test_tokenize_chars.py

@@ -1,10 +1,10 @@
-
+import pathlib
 import sys
 
 sys.path.insert(1, '/usr/workspace/wsa/laguna/fpchecker/FPChecker/parser')
 from tokenizer import Tokenizer
 
-FILENAME = "simple.cu"
+FILENAME = str(pathlib.Path(__file__).parent.absolute()) + "/simple.cu"
 
 def test_1():
   l = Tokenizer(FILENAME)

tests/parser/static/test_tokenize_simple/test_tokenize_simple.py

@@ -1,10 +1,10 @@
-
+import pathlib
 import sys
 
 sys.path.insert(1, '/usr/workspace/wsa/laguna/fpchecker/FPChecker/parser')
 from tokenizer import Tokenizer
 
-FILENAME = "simple.cu"
+FILENAME = str(pathlib.Path(__file__).parent.absolute()) + "/simple.cu"
 
 def test_1():
   l = Tokenizer(FILENAME)

tests/parser/static/test_tokenize_strings/test_tokenize_strings.py

@@ -1,10 +1,10 @@
-
+import pathlib
 import sys
 
 sys.path.insert(1, '/usr/workspace/wsa/laguna/fpchecker/FPChecker/parser')
 from tokenizer import Tokenizer
 
-FILENAME = "simple.cu"
+FILENAME = str(pathlib.Path(__file__).parent.absolute()) + "/simple.cu"
 
 def test_1():
   l = Tokenizer(FILENAME)