Tested racfed on c tests

Removed some redundant tests
Updated testing/README

Author: Gab-San

passes/RACFED.cpp

@@ -11,7 +11,7 @@
   -0xDEAD // The same value has to be used as initializer for the signatures in
           // the code
 
-#define MARTI_DEBUG true
+#define MARTI_DEBUG false
 
 using namespace llvm;
 
@@ -106,9 +106,9 @@ void RACFED::initializeBlocksSignatures(Function &Fn) {
 // --- UPDATE SIGNATURE RANDOM  ---
 void originalInstruction(BasicBlock &BB, std::vector<Instruction*> &OrigInstructions) {
   for (Instruction &I : BB) {
-    if (isa<PHINode>(&I)) continue; // NON è originale
-    if (I.isTerminator()) continue; // NON è originale
-    if (isa<DbgInfoIntrinsic>(&I)) continue; // debug, ignora OrigInstructions.push_back(&I);
+    if ( isa<PHINode>(&I) ) continue; // NON è originale
+    if ( I.isTerminator() ) continue; // NON è originale
+    if ( isa<DbgInfoIntrinsic>(&I) ) continue; // debug, ignora OrigInstructions.push_back(&I);
     OrigInstructions.push_back(&I);
   }
 }
@@ -122,15 +122,15 @@ void RACFED::updateCompileSigRandom(Function &Fn,
     std::vector<Instruction*> OrigInstructions;
     originalInstruction(BB, OrigInstructions);
 
-    if (OrigInstructions.size() <= 2) continue;
+    if ( OrigInstructions.size() <= 2 ) continue;
 
     uint64_t partial_sum = 0;
 
     for (Instruction *I : OrigInstructions) {
       Instruction *InsertPt = nullptr;
 
       // Non puoi inserire "dopo" un terminator: inserisci prima del terminator stesso
-      if (I->isTerminator()) {
+      if ( I->isTerminator() ) {
         InsertPt = I; // insert BEFORE terminator
       } else {
         InsertPt = I->getNextNode(); // insert BEFORE next instruction (equivale a "dopo I")
@@ -155,20 +155,20 @@ void RACFED::updateCompileSigRandom(Function &Fn,
 void RACFED::checkJumpSignature(BasicBlock &BB,
 				GlobalVariable *RuntimeSigGV, Type *IntType,
 				BasicBlock &ErrBB) {
-  if( BB.isEntryBlock() ) return;
+  if ( BB.isEntryBlock() ) return;
 
   // in this case BB is not the first Basic Block of the function, so it has
   // to update RuntimeSig and check it
   Instruction *FirstNonPHI = BB.getFirstNonPHI();
   if ( (FirstNonPHI && isa<LandingPadInst>(FirstNonPHI)) ||
      BB.getName().contains_insensitive("verification") ) {
 
-    if (BB.getFirstInsertionPt() == BB.end()) return; // Skip empty/invalid blocks
+    if ( BB.getFirstInsertionPt() == BB.end() ) return; // Skip empty/invalid blocks
 
     int randomNumberBB = compileTimeSig.find(&BB)->second;
     IRBuilder<> BChecker(&*BB.getFirstInsertionPt());
     BChecker.CreateStore(llvm::ConstantInt::get(IntType, randomNumberBB), RuntimeSigGV, true);
-  } else if (!BB.getName().contains_insensitive("errbb")) {
+  } else if ( !BB.getName().contains_insensitive("errbb") ) {
     int randomNumberBB = compileTimeSig.find(&BB)->second;
     int subRanPrevVal = subRanPrevVals.find(&BB)->second;
     BasicBlock *NewBB = BasicBlock::Create(
@@ -200,7 +200,7 @@ void RACFED::checkJumpSignature(BasicBlock &BB,
     for (BasicBlock *Succ : successors(&BB)) {
       for (PHINode &Phi : Succ->phis()) {
         for (unsigned i = 0; i < Phi.getNumIncomingValues(); ++i) {
-          if (Phi.getIncomingBlock(i) == NewBB) {
+          if ( Phi.getIncomingBlock(i) == NewBB ) {
             Phi.setIncomingBlock(i, &BB);
           }
         }
@@ -235,13 +235,13 @@ Constant* expectedSignature(
 }
 
 Value *RACFED::getCondition(Instruction &I) {
-  if (isa<BranchInst>(I) && cast<BranchInst>(I).isConditional()) {
-    if (!cast<BranchInst>(I).isConditional()) {
+  if ( isa<BranchInst>(I) && cast<BranchInst>(I).isConditional() ) {
+    if ( !cast<BranchInst>(I).isConditional() ) {
       return nullptr;
     } else {
       return cast<BranchInst>(I).getCondition();
     }
-  } else if (isa<SwitchInst>(I)) {
+  } else if ( isa<SwitchInst>(I) ) {
     errs() << "There is a switch!\n";
     abort();
     return cast<SwitchInst>(I).getCondition();
@@ -263,10 +263,10 @@ static void printSig(Module &Md, IRBuilder<> &B, Value *SigVal, const char *Msg)
 
   // Crea stringa globale "Msg: %ld\n"
   std::string Fmt = std::string(Msg) + ": %ld\n";
-  Value *FmtStr = B.CreateGlobalStringPtr(Fmt);
+  Value *FmtStr = B.CreateGlobalString(Fmt);
 
 
-  if (SigVal->getType()->isIntegerTy(32)) {
+  if ( SigVal->getType()->isIntegerTy(32) ) {
     SigVal = B.CreateZExt(SigVal, Type::getInt64Ty(Ctx));
   }
 
@@ -287,7 +287,7 @@ void RACFED::checkBranches(Module &Md, BasicBlock &BB,  GlobalVariable *RuntimeS
   IRBuilder<> B(&BB);
   B.SetInsertPoint(Term);
   auto *BI = dyn_cast<BranchInst>(Term);
-  if (!BI) return;
+  if ( !BI ) return;
 
   //TODO: check this
 
@@ -296,25 +296,29 @@ void RACFED::checkBranches(Module &Md, BasicBlock &BB,  GlobalVariable *RuntimeS
       static_cast<uint64_t>(compileTimeSig[&BB]) + sumIntraInstruction[&BB];
 
   Value *Current = B.CreateLoad(IntType, RuntimeSigGV, "current");
+  #if MARTI_DEBUG
   printSig(Md, B, Current, "current");
+  #endif
 
   //TODO: until here
 
   //define if conditional or unconditional branch
   //Conditional: expected= CT_succ+subRan_succ
   //adj = CTB-exp--> new signature = RT -adj
   if ( BI->isUnconditional() ) {  // only one successor
-      BasicBlock *Succ = BI->getSuccessor(0);
-      uint64_t Expected =
-            static_cast<uint64_t>(compileTimeSig[Succ] + subRanPrevVals[Succ]);
-      // adj = expected - current
-      uint64_t AdjValue = Expected - SourceStatic;
-      Value *Adj = ConstantInt::get(IntType, AdjValue);
-      Value *NewSig = B.CreateAdd(Current, Adj, "racfed_newsig");
-      B.CreateStore(NewSig, RuntimeSigGV);
-      printSig(Md,B, NewSig, "newsig");
+    BasicBlock *Succ = BI->getSuccessor(0);
+    uint64_t SuccExpected =
+      static_cast<uint64_t>(compileTimeSig[Succ] + subRanPrevVals[Succ]);
+    // adj = expected - current
+    uint64_t AdjValue = SuccExpected - SourceStatic;
+    Value *Adj = ConstantInt::get(IntType, AdjValue);
+    Value *NewSig = B.CreateAdd(Current, Adj, "racfed_newsig");
+    B.CreateStore(NewSig, RuntimeSigGV);
+    #if MARTI_DEBUG
+    printSig(Md,B, NewSig, "newsig");
+    #endif
 
-      return;
+    return;
   }
 
   if ( BI-> isConditional()) {
@@ -337,7 +341,9 @@ void RACFED::checkBranches(Module &Md, BasicBlock &BB,  GlobalVariable *RuntimeS
     Value *NewSig = B.CreateAdd(Current, Adj, "racfed_newsig");
     B.CreateStore(NewSig, RuntimeSigGV);
 
+    #if MARTI_DEBUG
     printSig(Md, B, NewSig, "SIG after cond");
+    #endif
   }
 }
 
@@ -360,11 +366,11 @@ Instruction *RACFED::checkReturnValue(BasicBlock &BB,
 			      Value *BckupRunSig) {
   Instruction *Term = BB.getTerminator();
 
-  if( !isa<ReturnInst>(Term) ) return nullptr;
+  if ( !isa<ReturnInst>(Term) ) return nullptr;
 
   std::vector<Instruction*> org_instr;
   originalInstruction(BB, org_instr);
-  if( org_instr.size() > 2 ) {
+  if ( org_instr.size() > 2 ) {
 
     // Splits the BB that contains the return instruction into
     // two basic blocks:
@@ -443,7 +449,7 @@ PreservedAnalyses RACFED::run(Module &Md, ModuleAnalysisManager &AM) {
   }
 
   for(Function &Fn: Md) {
-    if(!shouldCompile(Fn, FuncAnnotations)) continue;
+    if (!shouldCompile(Fn, FuncAnnotations)) continue;
 
     #if MARTI_DEBUG
     errs() << "Analysing func " << Fn.getName() << "\n";
@@ -474,23 +480,23 @@ PreservedAnalyses RACFED::run(Module &Md, ModuleAnalysisManager &AM) {
 
     Value * runtime_sign_bkup = nullptr;
     for (BasicBlock &BB : Fn) {
-      // TODO: Should the error basic block that is inserted be checked?
-
       // Backup of compile time sign when entering a function
-      if( BB.isEntryBlock() ) {
+      if ( BB.isEntryBlock() ) {
         IRBuilder<> InstrIR(&*BB.getFirstInsertionPt());
-	      runtime_sign_bkup =
-	        InstrIR.CreateLoad(I64, RuntimeSig, true, "backup_run_sig");
-	        InstrIR.CreateStore(llvm::ConstantInt::get(I64, compileTimeSig[&BB]),
-	          RuntimeSig);
+	if ( Fn.getName() != "main" ) {
+	  runtime_sign_bkup =
+	    InstrIR.CreateLoad(I64, RuntimeSig, true, "backup_run_sig");
+	}
+	InstrIR.CreateStore(llvm::ConstantInt::get(I64, compileTimeSig[&BB]),
+	  RuntimeSig);
       }
 
       checkJumpSignature(BB, RuntimeSig, I64, *ErrBB);
       RetInst = checkReturnValue(BB, RuntimeSig, I64, *ErrBB, runtime_sign_bkup);
       checkBranches(Md, BB, RuntimeSig, I64);
 
       // Restore signature on return
-      if( RetInst != nullptr ) {
+      if ( RetInst != nullptr && Fn.getName() != "main") {
 	      IRBuilder<> RetInstIR(RetInst);
 	      RetInstIR.CreateStore(runtime_sign_bkup, RuntimeSig);
       }

testing/README.md

@@ -4,12 +4,18 @@ This directory contains utilities and scripts for testing ASPIS.
 
 ## Local Testing
 
-For local testing, use the `test.py` script. Configure your tests using `test_config.toml`. Configure the llvm_bin flag in `llvm_bin.toml`.
+For local testing, use the `test.py` script. Configure your tests using `tests.toml`. Configure the llvm_bin flag in `llvm_bin.toml`.
 Then run:
 ```bash
 pytest test.py
 ```
 
+> To run pytest the modules listed in requirements.txt must be installed.
+> To install the modules:
+> - directly install them globally with `pip install -r requirements.txt`
+> - use a tool like conda
+> - setup a python environment `python -m venv env`
+
 ### Writing a configuration file
 
 Test config files must be `.toml` files with the following structure for each test:
@@ -22,7 +28,7 @@ expected_output = <output_expected>
 aspis_options = <compilation_flags>
 ```
 
-> `<relative_path_to_src_file>` will look into `./tests` folder
+> `<relative_path_to_src_file>` is a relative path from `./tests/` folder 
 
 ### Flags
 

testing/config/racfed-tests.toml

@@ -1,11 +1,104 @@
+# ml := multiline
+
 [[tests]]
-test_name = "multiline_add"
+test_name = "racfed_ml_add"
 source_file = "c/multi_instruction/add.c"
 expected_output = "30"
 aspis_options = "--no-dup --racfed"
 
 [[tests]]
-test_name = "multiline_func_ret"
-source_file = "c/multi_instruction/func_ret.c"
+test_name = "racfed_ml_function_call"
+source_file = "c/multi_instruction/function.c"
 expected_output = "foo() 25"
 aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_preserve_runtime_sig"
+source_file = "c/multi_instruction/call_less_two.c"
+expected_output = "0"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_ml_if_then_else"
+source_file = "c/multi_instruction/if_then_else.c"
+expected_output = "1001"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_ml_phi_instruction"
+source_file = "c/multi_instruction/phi.c"
+expected_output = "1"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_function_pointer"
+source_file = "c/control_flow/function_pointer.c"
+expected_output = "42"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_loop_exit"
+source_file = "c/control_flow/loop_exit.c"
+expected_output = "2"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_nested-branch"
+source_file = "c/control_flow/nested-branch.c"
+expected_output = "6"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_simple-branch"
+source_file = "c/control_flow/simple-branch.c"
+expected_output = "OK"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_switch-case"
+source_file = "c/control_flow/switch-case.c"
+expected_output = "300"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_data_dep_branches"
+source_file = "c/data_duplication_integrity/data_dep_branches.c"
+expected_output = "7"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_global_var_across_functions"
+source_file = "c/data_duplication_integrity/global_var_across_functions.c"
+expected_output = "2"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_misc_data_dup"
+source_file = "c/data_duplication_integrity/misc_data_dup.c"
+expected_output = "OK"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_volatile_io"
+source_file = "c/data_duplication_integrity/volatile_io.c"
+expected_output = "42"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_arit_pipeline"
+source_file = "c/misc_math/arit_pipeline.c"
+expected_output = "3"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_mixed_ops"
+source_file = "c/misc_math/mixed_ops.c"
+expected_output = "14.5"
+aspis_options = "--no-dup --racfed"
+
+[[tests]]
+test_name = "racfed_xor_cypher"
+source_file = "c/misc_math/xor_cypher.c"
+expected_output = "SUCCESS"
+aspis_options = "--no-dup --racfed"
+

testing/tests/c/multi_instruction/add.c

@@ -1,5 +1,5 @@
 //
-// Created by Martina Starone on 24/12/25.
+// Created by Gabriele Santandrea on 24/12/25.
 //
 #include <stdio.h>