Revert changes to comment format now that preprocessor is being used

jordancarlin · Oct 18, 2024 · 269a3ca · 269a3ca
1 parent 462ddeb
commit 269a3ca
Show file tree

Hide file tree

Showing 36 changed files with 1,073 additions and 1,073 deletions.
diff --git a/tests/coverage/WALLY-init-lib.h b/tests/coverage/WALLY-init-lib.h
@@ -1,32 +1,32 @@
-##########################################
-# WALLY-init-lib.h
-#
-# Written: [email protected] 21 March 2023
-#
-# Purpose: Initialize stack, handle interrupts, terminate test case
-#
-# A component of the CORE-V-WALLY configurable RISC-V project.
-# https://github.com/openhwgroup/cvw
-#
-# Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
-#
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-#
-# Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
-# except in compliance with the License, or, at your option, the Apache License version 2.0. You
-# may obtain a copy of the License at
-#
-# https://solderpad.org/licenses/SHL-2.1/
-#
-# Unless required by applicable law or agreed to in writing, any work distributed under the
-# License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-##############################################################################################
-
-# load code to initalize stack, handle interrupts, terminate
-# The PMP tests are sensitive to the exact addresses in this code, so unfortunately
-# modifying anything breaks those tests.
+///////////////////////////////////////////
+// WALLY-init-lib.h
+//
+// Written: [email protected] 21 March 2023
+//
+// Purpose: Initialize stack, handle interrupts, terminate test case
+//
+// A component of the CORE-V-WALLY configurable RISC-V project.
+// https://github.com/openhwgroup/cvw
+//
+// Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
+//
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+//
+// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+// except in compliance with the License, or, at your option, the Apache License version 2.0. You
+// may obtain a copy of the License at
+//
+// https://solderpad.org/licenses/SHL-2.1/
+//
+// Unless required by applicable law or agreed to in writing, any work distributed under the
+// License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+// load code to initalize stack, handle interrupts, terminate
+// The PMP tests are sensitive to the exact addresses in this code, so unfortunately
+// modifying anything breaks those tests.
 
 .section .text.init
 .global rvtest_entry_point
@@ -128,7 +128,7 @@ trap_return:            # return from trap handler
 self_loop:
     j self_loop         # wait
 
-# utility routines
+// utility routines
 
 # put a 1 in msb of a0 (position XLEN-1); works for both RV32 and RV64
 setmsb:

diff --git a/tests/coverage/amoAccessFault.S b/tests/coverage/amoAccessFault.S
@@ -1,30 +1,30 @@
-##########################################
-# hptwAccessFault.S
-#
-# Written: Rose Thompson [email protected]
-#
-# Purpose: Checks that only Store/AMO access faults are generated on AMO operations
-#
-# A component of the CORE-V-WALLY configurable RISC-V project.
-# https://#github.com/openhwgroup/cvw
-#
-# Copyright (C) 2021-24 Harvey Mudd College & Oklahoma State University
-#
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-#
-# Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
-# except in compliance with the License, or, at your option, the Apache License version 2.0. You
-# may obtain a copy of the License at
-#
-# https://#solderpad.org/licenses/SHL-2.1/
-#
-# Unless required by applicable law or agreed to in writing, any work distributed under the
-# License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-###############################################################################################
-
-# load code to initalize stack, handle interrupts, terminate
+///////////////////////////////////////////
+// hptwAccessFault.S
+//
+// Written: Rose Thompson [email protected]
+//
+// Purpose: Checks that only Store/AMO access faults are generated on AMO operations
+//
+// A component of the CORE-V-WALLY configurable RISC-V project.
+// https://github.com/openhwgroup/cvw
+//
+// Copyright (C) 2021-24 Harvey Mudd College & Oklahoma State University
+//
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+//
+// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+// except in compliance with the License, or, at your option, the Apache License version 2.0. You
+// may obtain a copy of the License at
+//
+// https://solderpad.org/licenses/SHL-2.1/
+//
+// Unless required by applicable law or agreed to in writing, any work distributed under the
+// License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+// load code to initalize stack, handle interrupts, terminate
 
 #include "WALLY-init-lib.h"
 

diff --git a/tests/coverage/csrwrites.S b/tests/coverage/csrwrites.S
@@ -1,30 +1,30 @@
-##########################################
-# csrwrites.S
-#
-# Written: [email protected] 21 March 2023
-#
-# Purpose: Test writes to CSRs
-#
-# A component of the CORE-V-WALLY configurable RISC-V project.
-# https://github.com/openhwgroup/cvw
-#
-# Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
-#
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-#
-# Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
-# except in compliance with the License, or, at your option, the Apache License version 2.0. You
-# may obtain a copy of the License at
-#
-# https://solderpad.org/licenses/SHL-2.1/
-#
-# Unless required by applicable law or agreed to in writing, any work distributed under the
-# License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-##############################################################################################
+///////////////////////////////////////////
+// csrwrites.S
+//
+// Written: [email protected] 21 March 2023
+//
+// Purpose: Test writes to CSRs
+//
+// A component of the CORE-V-WALLY configurable RISC-V project.
+// https://github.com/openhwgroup/cvw
+//
+// Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
+//
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+//
+// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+// except in compliance with the License, or, at your option, the Apache License version 2.0. You
+// may obtain a copy of the License at
+//
+// https://solderpad.org/licenses/SHL-2.1/
+//
+// Unless required by applicable law or agreed to in writing, any work distributed under the
+// License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+////////////////////////////////////////////////////////////////////////////////////////////////
 
-# load code to initalize stack, handle interrupts, terminate
+// load code to initalize stack, handle interrupts, terminate
 #include "WALLY-init-lib.h"
 
 main:

diff --git a/tests/coverage/dcache1.S b/tests/coverage/dcache1.S
@@ -1,9 +1,9 @@
       #include "WALLY-init-lib.h"
 main:
-      # start way test #1
+      // start way test #1
       li t0, 0x80100000
 .align 6
-      # i$ boundary, way test #1
+      // i$ boundary, way test #1
       .word 0x00000013
       .word 0x00000013
       .word 0x00000013
@@ -20,10 +20,10 @@ main:
       sd zero, 0(t0)
       .word 0x00000013
       .word 0x00000013
-      # start way test #2
+      // start way test #2
       li t0, 0x80101000
 .align 6
-      # i$ boundary, way test #2
+      // i$ boundary, way test #2
       .word 0x00000013
       .word 0x00000013
       .word 0x00000013
@@ -40,10 +40,10 @@ main:
       sd zero, 0(t0)
       .word 0x00000013
       .word 0x00000013
-      # start way test #3
+      // start way test #3
       li t0, 0x80102000
 .align 6
-      # i$ boundary, way test #3
+      // i$ boundary, way test #3
       .word 0x00000013
       .word 0x00000013
       .word 0x00000013
@@ -60,10 +60,10 @@ main:
       sd zero, 0(t0)
       .word 0x00000013
       .word 0x00000013
-      # start way test #4
+      // start way test #4
       li t0, 0x80103000
 .align 6
-      # i$ boundary, way test #4
+      // i$ boundary, way test #4
       .word 0x00000013
       .word 0x00000013
       .word 0x00000013

diff --git a/tests/coverage/dcache1.py b/tests/coverage/dcache1.py
@@ -44,7 +44,7 @@ def wl(line="", comment=None, fname=test_name):
                           ".align" in line or
                           "# include" in line) else True
         indent = 6 if instr else 0
-        comment = "# " + comment if comment is not None else ""
+        comment = "// " + comment if comment is not None else ""
         to_write = " " * indent + line + comment + "\n"
         f.write(to_write)
 

diff --git a/tests/coverage/dcache2.S b/tests/coverage/dcache2.S
@@ -1,48 +1,48 @@
-##########################################
-# dcache2.S
-#
-# Written: [email protected] 18 April 2023
-#
-# Purpose: Test Coverage for D$
-#          (for all 4 cache ways, trigger a FlushStage while SetDirtyWay=1)
-#
-# A component of the CORE-V-WALLY configurable RISC-V project.
-# https://github.com/openhwgroup/cvw
-#
-# Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
-#
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-#
-# Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
-# except in compliance with the License, or, at your option, the Apache License version 2.0. You
-# may obtain a copy of the License at
-#
-# https://solderpad.org/licenses/SHL-2.1/
-#
-# Unless required by applicable law or agreed to in writing, any work distributed under the
-# License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-##############################################################################################
+///////////////////////////////////////////
+// dcache2.S
+//
+// Written: [email protected] 18 April 2023
+//
+// Purpose: Test Coverage for D$
+//          (for all 4 cache ways, trigger a FlushStage while SetDirtyWay=1)
+//
+// A component of the CORE-V-WALLY configurable RISC-V project.
+// https://github.com/openhwgroup/cvw
+//
+// Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
+//
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+//
+// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+// except in compliance with the License, or, at your option, the Apache License version 2.0. You
+// may obtain a copy of the License at
+//
+// https://solderpad.org/licenses/SHL-2.1/
+//
+// Unless required by applicable law or agreed to in writing, any work distributed under the
+// License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "WALLY-init-lib.h"
 main:
-        # way 0
+        // way 0
         li t0, 0x80100770
         sd zero, 0(t0)
         sd zero, 1(t0)
 
-        # way 1
+        // way 1
         li t0, 0x80101770
         sd zero, 0(t0)
         sd zero, 1(t0)
 
-        # way 2
+        // way 2
         li t0, 0x80102770
         sd zero, 0(t0)
         sd zero, 1(t0)
 
-        # way 3
+        // way 3
         li t0, 0x80103770
         sd zero, 0(t0)
         sd zero, 1(t0)

diff --git a/tests/coverage/ebu.S b/tests/coverage/ebu.S
@@ -1,30 +1,30 @@
-##########################################
-# ebu.S
-#
-# Written: [email protected] 21 January 2024
-#
-# Purpose: Test coverage for EBU
-#
-# A component of the CORE-V-WALLY configurable RISC-V project.
-# https://github.com/openhwgroup/cvw
-#
-# Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
-#
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-#
-# Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
-# except in compliance with the License, or, at your option, the Apache License version 2.0. You
-# may obtain a copy of the License at
-#
-# https://solderpad.org/licenses/SHL-2.1/
-#
-# Unless required by applicable law or agreed to in writing, any work distributed under the
-# License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-##############################################################################################
-
-# load code to initalize stack, handle interrupts, terminate
+///////////////////////////////////////////
+// ebu.S
+//
+// Written: [email protected] 21 January 2024
+//
+// Purpose: Test coverage for EBU
+//
+// A component of the CORE-V-WALLY configurable RISC-V project.
+// https://github.com/openhwgroup/cvw
+//
+// Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
+//
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+//
+// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
+// except in compliance with the License, or, at your option, the Apache License version 2.0. You
+// may obtain a copy of the License at
+//
+// https://solderpad.org/licenses/SHL-2.1/
+//
+// Unless required by applicable law or agreed to in writing, any work distributed under the
+// License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+// load code to initalize stack, handle interrupts, terminate
 
 #include "WALLY-init-lib.h"
 

diff --git a/tests/coverage/floatmisc.S b/tests/coverage/floatmisc.S
@@ -1,7 +1,7 @@
-# debug.S
-# [email protected] 4 February 2023
-# Small code snippets for the purpose of debugging issues
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+// debug.S
+// [email protected] 4 February 2023
+// Small code snippets for the purpose of debugging issues
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 
 .global rvtest_entry_point
 rvtest_entry_point: