diff --git a/sw/example/performance_tests/I/main.c b/sw/example/performance_tests/I/main.c
index a508c4bb3..d6649fb2d 100644
--- a/sw/example/performance_tests/I/main.c
+++ b/sw/example/performance_tests/I/main.c
@@ -1,9 +1,6 @@
 // #################################################################################################
 // # << NEORV32 - Processor Performance Measurement >>                                             #
 // # ********************************************************************************************* #
-// # (c) "AXI", "AXI4" and "AXI4-Lite" are trademarks of Arm Holdings plc.                         #
-// # Note: External MTIME is not supported.                                                        #
-// # ********************************************************************************************* #
 // # BSD 3-Clause License                                                                          #
 // #                                                                                               #
 // # Copyright (c) 2023, Stephan Nolting. All rights reserved.                                     #
@@ -70,10 +67,10 @@ int main() {
   // Disable compilation by default
   #ifndef RUN_CHECK
     #warning Program HAS NOT BEEN COMPILED! Use >>make USER_FLAGS+=-DRUN_CHECK clean_all exe<< to compile it.
-  
+
     // inform the user if you are actually executing this
     neorv32_uart0_printf("ERROR! Program has not been compiled. Use >>make USER_FLAGS+=-DRUN_CHECK clean_all exe<< to compile it.\n");
-  
+
     return 1;
   #endif
 
@@ -326,7 +323,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\naddi rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -352,7 +349,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nsub rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -378,7 +375,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nlui rd,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -460,7 +457,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nsli rd,rs1,shamt inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     __asm__ ("li a2, 31\n\t"); // set a2 to 31 to ensure we have the largest shift
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -487,7 +484,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nsrl rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -540,7 +537,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nsra rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -595,7 +592,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nxor rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -621,7 +618,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nxori rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -647,7 +644,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nand rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -673,7 +670,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nandi rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -699,7 +696,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nor rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -754,7 +751,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nslt rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -806,7 +803,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nsltu rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -861,7 +858,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nlb rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -887,7 +884,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nlh rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -939,7 +936,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nlhu rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -995,7 +992,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nsb rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -1021,7 +1018,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nsh rd,rs1,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -1076,7 +1073,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\ncsrrw rd,csr,rs1 inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -1102,7 +1099,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\ncsrrs rd,csr,rs1 inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -1128,7 +1125,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\ncsrrc rd,csr,rs1 inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -1154,7 +1151,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\ncsrrwi rd,csr,rs1 inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -1180,7 +1177,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\ncsrrsi rd,csr,rs1 inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -1324,8 +1321,8 @@ int main() {
   #if rv32I_branch_beq == 1
     instToTest += 3;
     // set up compare variables
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 2\n\t"); // set a2 to 2 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 2\n\t"); // set a2 to 2
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -1353,8 +1350,8 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbeq rs1,rs2,imm no branch inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 1\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -1382,12 +1379,12 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbeq rs1,rs2,imm branch forward inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 1\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
-      
+
       #if instCalls == 16
         __asm__ ("jal .+132\n\t");
         __asm__ ("jal .+132\n\t");
@@ -1430,7 +1427,7 @@ int main() {
   #if rv32I_branch_bne == 1
     instToTest += 3;
     // set up compare variables
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
     __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
@@ -1459,8 +1456,8 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbne rs1,rs2,imm no branch inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 2\n\t"); // set a2 to 2 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 2\n\t"); // set a2 to 2
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -1488,12 +1485,12 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbne rs1,rs2,imm branch forward inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 2\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 2\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
-      
+
       #if instCalls == 16
         __asm__ ("jal .+132\n\t");
         __asm__ ("jal .+132\n\t");
@@ -1536,7 +1533,7 @@ int main() {
   #if rv32I_branch_blt == 1
     instToTest += 3;
     // set up compare variables
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
     __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
@@ -1565,8 +1562,8 @@ int main() {
     #endif
     neorv32_uart0_printf("\nblt rs1,rs2,imm no branch inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 2\n\t"); // set a2 to 2 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 2\n\t"); // set a2 to 2
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -1594,12 +1591,12 @@ int main() {
     #endif
     neorv32_uart0_printf("\nblt rs1,rs2,imm branch forward inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 2\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 2\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
-      
+
       #if instCalls == 16
         __asm__ ("jal .+132\n\t");
         __asm__ ("jal .+132\n\t");
@@ -1642,7 +1639,7 @@ int main() {
   #if rv32I_branch_bge == 1
     instToTest += 3;
     // set up compare variables
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
     __asm__ ("li a2, 2\n\t"); // set a2 to 2
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
@@ -1671,8 +1668,8 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbge rs1,rs2,imm no branch inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 2\n\t"); // set a1 to 2 
-    __asm__ ("li a2, 1\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 2\n\t"); // set a1 to 2
+    __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -1700,12 +1697,12 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbge rs1,rs2,imm branch forward inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 2\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 1\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 2\n\t"); // set a1 to 1
+    __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
-      
+
       #if instCalls == 16
         __asm__ ("jal .+132\n\t");
         __asm__ ("jal .+132\n\t");
@@ -1748,7 +1745,7 @@ int main() {
   #if rv32I_branch_bltu == 1
     instToTest += 3;
     // set up compare variables
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
     __asm__ ("li a2, 1\n\t"); // set a2 to 2
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
@@ -1777,8 +1774,8 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbltu rs1,rs2,imm no branch inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 2 
-    __asm__ ("li a2, 2\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 2
+    __asm__ ("li a2, 2\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -1806,12 +1803,12 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbltu rs1,rs2,imm branch forward inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 2\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
+    __asm__ ("li a2, 2\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
-      
+
       #if instCalls == 16
         __asm__ ("jal .+132\n\t");
         __asm__ ("jal .+132\n\t");
@@ -1854,7 +1851,7 @@ int main() {
   #if rv32I_branch_bgeu == 1
     instToTest += 3;
     // set up compare variables
-    __asm__ ("li a1, 1\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 1\n\t"); // set a1 to 1
     __asm__ ("li a2, 2\n\t"); // set a2 to 2
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
@@ -1883,8 +1880,8 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbgeu rs1,rs2,imm no branch inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 2\n\t"); // set a1 to 2 
-    __asm__ ("li a2, 1\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 2\n\t"); // set a1 to 2
+    __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -1912,12 +1909,12 @@ int main() {
     #endif
     neorv32_uart0_printf("\nbgeu rs1,rs2,imm branch forward inst %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
 
-    __asm__ ("li a1, 2\n\t"); // set a1 to 1 
-    __asm__ ("li a2, 1\n\t"); // set a2 to 1 
+    __asm__ ("li a1, 2\n\t"); // set a1 to 1
+    __asm__ ("li a2, 1\n\t"); // set a2 to 1
 
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
-      
+
       #if instCalls == 16
         __asm__ ("jal .+132\n\t");
         __asm__ ("jal .+132\n\t");
@@ -2013,6 +2010,6 @@ int main() {
 
   // Stop simulation
   if (neorv32_gpio_available()) {
-    neorv32_gpio_pin_set(32);
+    neorv32_gpio_pin_set(32, 1);
   }
 }
diff --git a/sw/example/performance_tests/M/main.c b/sw/example/performance_tests/M/main.c
index 1e87efcf9..e31cf98cd 100644
--- a/sw/example/performance_tests/M/main.c
+++ b/sw/example/performance_tests/M/main.c
@@ -1,9 +1,6 @@
 // #################################################################################################
 // # << NEORV32 - Processor Performance Measurement >>                                             #
 // # ********************************************************************************************* #
-// # (c) "AXI", "AXI4" and "AXI4-Lite" are trademarks of Arm Holdings plc.                         #
-// # Note: External MTIME is not supported.                                                        #
-// # ********************************************************************************************* #
 // # BSD 3-Clause License                                                                          #
 // #                                                                                               #
 // # Copyright (c) 2023, Stephan Nolting. All rights reserved.                                     #
@@ -69,10 +66,10 @@ int main() {
   // Disable compilation by default
   #ifndef RUN_CHECK
     #warning Program HAS NOT BEEN COMPILED! Use >>make USER_FLAGS+=-DRUN_CHECK clean_all exe<< to compile it.
-  
+
     // inform the user if you are actually executing this
     neorv32_uart0_printf("ERROR! Program has not been compiled. Use >>make USER_FLAGS+=-DRUN_CHECK clean_all exe<< to compile it.\n");
-  
+
     return 1;
   #endif
 
@@ -84,7 +81,7 @@ int main() {
     #define rv32M_mult  1
     #define rv32M_div  1
     #define rv32M_rem  1
-  #endif  
+  #endif
   #ifndef rv32M_mult
     #define rv32M_mult  0
   #endif
@@ -148,7 +145,7 @@ int main() {
   #if rv32M_mult == 1
     instToTest += 4;
     // set up compute variables
-    __asm__ ("li a1, 87654321\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 87654321\n\t"); // set a1 to 1
     __asm__ ("li a2, 12345678\n\t"); // set a2 to 2
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -201,7 +198,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nmulh rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -227,7 +224,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nmulhsu rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
       #if instCalls == 16
@@ -253,13 +250,13 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nmulhu rd,imm inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
   #endif
 
   #if rv32M_div == 1
     instToTest += 2;
     // set up compute variables
-    __asm__ ("li a1, 87654321\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 87654321\n\t"); // set a1 to 1
     __asm__ ("li a2, 12345678\n\t"); // set a2 to 2
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -312,13 +309,13 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\ndivu rd,rs1,shamt inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
   #endif
 
   #if rv32M_rem == 1
     instToTest += 2;
     // set up compute variables
-    __asm__ ("li a1, 87654321\n\t"); // set a1 to 1 
+    __asm__ ("li a1, 87654321\n\t"); // set a1 to 1
     __asm__ ("li a2, 12345678\n\t"); // set a2 to 2
     startTime = neorv32_cpu_csr_read(CSR_MCYCLE);
     for (i = 0; i < instLoop; i++) {
@@ -371,7 +368,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nremu rd,rs1,rs2 inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
   #endif
 
   int instructions  = instToTest * instLoop * instCalls;
@@ -385,6 +382,6 @@ int main() {
 
   // Stop simulation
   if (neorv32_gpio_available()) {
-    neorv32_gpio_pin_set(32);
+    neorv32_gpio_pin_set(32, 1);
   }
 }
diff --git a/sw/example/performance_tests/Zfinx/main.c b/sw/example/performance_tests/Zfinx/main.c
index 16b3ac320..d1425d96a 100644
--- a/sw/example/performance_tests/Zfinx/main.c
+++ b/sw/example/performance_tests/Zfinx/main.c
@@ -1,9 +1,6 @@
 // #################################################################################################
 // # << NEORV32 - Processor Performance Measurement >>                                             #
 // # ********************************************************************************************* #
-// # (c) "AXI", "AXI4" and "AXI4-Lite" are trademarks of Arm Holdings plc.                         #
-// # Note: External MTIME is not supported.                                                        #
-// # ********************************************************************************************* #
 // # BSD 3-Clause License                                                                          #
 // #                                                                                               #
 // # Copyright (c) 2023, Stephan Nolting. All rights reserved.                                     #
@@ -70,10 +67,10 @@ int main() {
   // Disable compilation by default
   #ifndef RUN_CHECK
     #warning Program HAS NOT BEEN COMPILED! Use >>make USER_FLAGS+=-DRUN_CHECK clean_all exe<< to compile it.
-  
+
     // inform the user if you are actually executing this
     neorv32_uart0_printf("ERROR! Program has not been compiled. Use >>make USER_FLAGS+=-DRUN_CHECK clean_all exe<< to compile it.\n");
-  
+
     return 1;
   #endif
 
@@ -369,7 +366,7 @@ int main() {
       neorv32_uart0_printf("\ntotal %d cyc\n", totalTime);
     #endif
     neorv32_uart0_printf("\nfsub.s rd,rs1,rs2 max. inst. %d cyc\n", (stopTime - startTime)/(instLoop * instCalls));
-  
+
     // set up compute variables
     __asm__ ("li a1, 0x00000000\n\t"); // set a1 to +1.0 2^0
     __asm__ ("li a2, 0x00000000\n\t"); // set a2 to +1.0 2^0
@@ -1171,6 +1168,6 @@ int main() {
 
   // Stop simulation
   if (neorv32_gpio_available()) {
-    neorv32_gpio_pin_set(32);
+    neorv32_gpio_pin_set(32, 1);
   }
 }
diff --git a/sw/example/processor_check/main.c b/sw/example/processor_check/main.c
index dff7a5923..800c49874 100644
--- a/sw/example/processor_check/main.c
+++ b/sw/example/processor_check/main.c
@@ -1319,6 +1319,8 @@ int main() {
     int xirq_err_cnt = 0;
     xirq_trap_handler_ack = 0;
 
+    neorv32_gpio_port_set(0);
+
     xirq_err_cnt += neorv32_xirq_setup(); // initialize XIRQ
     xirq_err_cnt += neorv32_xirq_install(0, xirq_trap_handler0); // install XIRQ IRQ handler channel 0
     xirq_err_cnt += neorv32_xirq_install(1, xirq_trap_handler1); // install XIRQ IRQ handler channel 1
diff --git a/sw/lib/include/neorv32_gpio.h b/sw/lib/include/neorv32_gpio.h
index 1e8ec3f99..595ceb52a 100644
--- a/sw/lib/include/neorv32_gpio.h
+++ b/sw/lib/include/neorv32_gpio.h
@@ -40,12 +40,11 @@ typedef volatile struct __attribute__((packed,aligned(4))) {
  **************************************************************************/
 /**@{*/
 int      neorv32_gpio_available(void);
-void     neorv32_gpio_pin_set(int pin);
-void     neorv32_gpio_pin_clr(int pin);
+void     neorv32_gpio_pin_set(int pin, int value);
 void     neorv32_gpio_pin_toggle(int pin);
 uint32_t neorv32_gpio_pin_get(int pin);
-
 void     neorv32_gpio_port_set(uint64_t d);
+void     neorv32_gpio_port_toggle(uint64_t toggle);
 uint64_t neorv32_gpio_port_get(void);
 /**@}*/
 
diff --git a/sw/lib/source/neorv32_gpio.c b/sw/lib/source/neorv32_gpio.c
index d1fc8fcae..8f59632f8 100644
--- a/sw/lib/source/neorv32_gpio.c
+++ b/sw/lib/source/neorv32_gpio.c
@@ -39,34 +39,27 @@ int neorv32_gpio_available(void) {
  * Set single pin of GPIO's output port.
  *
  * @param[in] pin Output pin number to be set (0..63).
+ * @param[in] value Set pint high (1) or low (0).
  **************************************************************************/
-void neorv32_gpio_pin_set(int pin) {
+void neorv32_gpio_pin_set(int pin, int value) {
 
   uint32_t mask = (uint32_t)(1 << (pin & 0x1f));
 
   if (pin < 32) {
-    NEORV32_GPIO->OUTPUT_LO |= mask;
+    if (value) {
+      NEORV32_GPIO->OUTPUT_LO |= mask;
+    }
+    else {
+      NEORV32_GPIO->OUTPUT_LO &= ~mask;
+    }
   }
   else {
-    NEORV32_GPIO->OUTPUT_HI |= mask;
-  }
-}
-
-
-/**********************************************************************//**
- * Clear single pin of GPIO's output port.
- *
- * @param[in] pin Output pin number to be cleared (0..63).
- **************************************************************************/
-void neorv32_gpio_pin_clr(int pin) {
-
-  uint32_t mask = (uint32_t)(1 << (pin & 0x1f));
-
-  if (pin < 32) {
-    NEORV32_GPIO->OUTPUT_LO &= ~mask;
-  }
-  else {
-    NEORV32_GPIO->OUTPUT_HI &= ~mask;
+    if (value) {
+      NEORV32_GPIO->OUTPUT_HI |= mask;
+    }
+    else {
+      NEORV32_GPIO->OUTPUT_HI &= ~mask;
+    }
   }
 }
 
@@ -126,6 +119,24 @@ void neorv32_gpio_port_set(uint64_t port_data) {
 }
 
 
+/**********************************************************************//**
+ * Toggle bit in entire GPIO output port.
+ *
+ * @param[in] toggle Bit mask; set bits will toggle the according output port (64-bit).
+ **************************************************************************/
+void neorv32_gpio_port_toggle(uint64_t toggle) {
+
+  union {
+    uint64_t uint64;
+    uint32_t uint32[sizeof(uint64_t)/sizeof(uint32_t)];
+  } data;
+
+  data.uint64 = toggle;
+  NEORV32_GPIO->OUTPUT_LO ^= data.uint32[0];
+  NEORV32_GPIO->OUTPUT_HI ^= data.uint32[1];
+}
+
+
 /**********************************************************************//**
  * Get complete GPIO input port.
  *
@@ -143,4 +154,3 @@ uint64_t neorv32_gpio_port_get(void) {
 
   return data.uint64;
 }
-