review comments

Author: sjain-stanford

sharkfuser/build_tools/cmake/CTestMacros.cmake

@@ -7,7 +7,7 @@
 
 # Creates a sharkfuser C++ test.
 #
-#  sharkfuser_cc_test(
+#  add_sharkfuser_test(
 #    NAME <test-name>
 #    SRCS <file> [<file> ...]
 #    [DEPS <dep> [<dep> ...]]
@@ -22,7 +22,7 @@
 # DEPS
 #  Additional library dependencies beyond the standard ones
 #  (libfusili and Catch2::Catch2WithMain are always linked)
-function(sharkfuser_cc_test)
+function(add_sharkfuser_test)
   if(NOT SHARKFUSER_BUILD_TESTS)
     return()
   endif()
@@ -46,7 +46,7 @@ endfunction()
 
 # Creates a sharkfuser C++ sample.
 #
-#  sharkfuser_cc_sample(
+#  add_sharkfuser_sample(
 #    NAME <test-name>
 #    SRCS <file> [<file> ...]
 #    [DEPS <dep> [<dep> ...]]
@@ -61,7 +61,7 @@ endfunction()
 # DEPS
 #  Additional library dependencies beyond the standard ones
 #  (libfusili and Catch2::Catch2WithMain are always linked)
-function(sharkfuser_cc_sample)
+function(add_sharkfuser_sample)
   if(NOT SHARKFUSER_BUILD_SAMPLES)
     return()
   endif()
@@ -85,7 +85,7 @@ endfunction()
 
 # Creates a sharkfuser lit test.
 #
-#  sharkfuser_lit_test(
+#  add_sharkfuser_lit_test(
 #    SRC <file>
 #    [DEPS <dep> [<dep> ...]]
 #    [TOOLS <tool> [<tool> ...]]
@@ -100,7 +100,7 @@ endfunction()
 #
 # TOOLS
 #  External tools needed for the test
-function(sharkfuser_lit_test)
+function(add_sharkfuser_lit_test)
   if(NOT SHARKFUSER_BUILD_TESTS)
     return()
   endif()
@@ -114,7 +114,7 @@ function(sharkfuser_lit_test)
   )
 
   if(NOT _RULE_SRC)
-    message(FATAL_ERROR "sharkfuser_lit_test: SRC parameter is required")
+    message(FATAL_ERROR "add_sharkfuser_lit_test: SRC parameter is required")
   endif()
 
   get_filename_component(_TEST_NAME ${_RULE_SRC} NAME_WE)

sharkfuser/samples/CMakeLists.txt

@@ -5,10 +5,10 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 
-# Use prebuilt Catch2 library instead of building from source
+# Find prebuilt Catch2 library
 find_package(Catch2 3 REQUIRED)
 
-sharkfuser_cc_sample(
+add_sharkfuser_sample(
   NAME sharkfuser_convolution_samples
   SRCS
     convolution/conv_fprop.cpp

sharkfuser/tests/CMakeLists.txt

@@ -5,10 +5,10 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 
-# Use prebuilt Catch2 library instead of building from source
+# Find prebuilt Catch2 library
 find_package(Catch2 3 REQUIRED)
 
-# Find lit (pip or system installed)
+# Find lit program (pip or system installed)
 if(NOT SHARKFUSER_EXTERNAL_LIT)
   find_program(SHARKFUSER_EXTERNAL_LIT NAMES lit)
   if(NOT SHARKFUSER_EXTERNAL_LIT)
@@ -17,7 +17,7 @@ if(NOT SHARKFUSER_EXTERNAL_LIT)
 endif()
 message(STATUS "Using lit: ${SHARKFUSER_EXTERNAL_LIT}")
 
-# Find filecheck (pip or system installed)
+# Find filecheck program (pip or system installed)
 if(NOT SHARKFUSER_EXTERNAL_FILECHECK)
   find_program(SHARKFUSER_EXTERNAL_FILECHECK NAMES filecheck)
   if(NOT SHARKFUSER_EXTERNAL_FILECHECK)
@@ -27,39 +27,39 @@ endif()
 message(STATUS "Using filecheck: ${SHARKFUSER_EXTERNAL_FILECHECK}")
 
 
-sharkfuser_cc_test(
+add_sharkfuser_test(
   NAME sharkfuser_attribute_tests
   SRCS
     test_attributes.cpp
     test_tensor_attributes.cpp
     test_conv_attributes.cpp
 )
 
-sharkfuser_cc_test(
+add_sharkfuser_test(
   NAME sharkfuser_tensor_tests
   SRCS
     test_tensor.cpp
 )
 
-sharkfuser_cc_test(
+add_sharkfuser_test(
   NAME sharkfuser_node_tests
   SRCS
     test_conv_node.cpp
 )
 
-sharkfuser_cc_test(
+add_sharkfuser_test(
   NAME sharkfuser_graph_tests
   SRCS
     test_graph.cpp
     test_context.cpp
 )
 
-sharkfuser_cc_test(
+add_sharkfuser_test(
   NAME sharkfuser_logging_tests
   SRCS
     test_logging.cpp
 )
 
-sharkfuser_lit_test(
- SRC test_example_lit.cpp
+add_sharkfuser_lit_test(
+  SRC test_example_lit.cpp
 )