fix macos build and cleanup cmake

Author: 1a1a11a

CMakeLists.txt

@@ -104,6 +104,9 @@ set(LIBCACHESIM_CXX_FLAGS
     -Wno-pedantic -Wformat=2 -Wformat-security -Wshadow -Wwrite-strings -Wmissing-include-dirs
 )
 
+# maek sure the symbols are exported so that we can use dlsym
+set(CMAKE_C_VISIBILITY_PRESET default)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 0)
 
 # Find dependencies
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@@ -221,7 +224,13 @@ set(libCacheSim_binary_include_dir ${CMAKE_CURRENT_BINARY_DIR}/libCacheSim/inclu
 
 include_directories(${libCacheSim_include_dir})
 include_directories(${libCacheSim_binary_include_dir})
-set(all_modules cache_lib_c cache_lib_cpp traceReader_lib profiler_lib dataStructure_lib utils_lib traceAnalyzer_lib)
+# Restructured to avoid transitive dependency duplicates
+# profiler_lib already includes cache_lib_c, cache_lib_cpp, traceReader_lib (which includes utils_lib)
+# Only include top-level libraries to avoid duplicates
+set(all_modules cache_lib_c cache_lib_cpp traceReader_lib profiler_lib dataStructure_lib utils_lib traceAnalyzer_lib mrcProfiler_lib)
+# For linking: use minimal sets to avoid transitive dependency duplicates
+set(core_libs cache_lib_c cache_lib_cpp traceReader_lib dataStructure_lib utils_lib)
+set(high_level_libs profiler_lib traceAnalyzer_lib)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libCacheSim/cache)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libCacheSim/dataStructure)
@@ -250,7 +259,7 @@ endif()
 add_library(${PROJECT_NAME} INTERFACE)
 
 # Link all modular libraries into the unified library
-target_link_libraries(${PROJECT_NAME} INTERFACE ${all_modules})
+target_link_libraries(${PROJECT_NAME} INTERFACE ${high_level_libs})
 
 # Set include directories for the unified library
 target_include_directories(${PROJECT_NAME} INTERFACE

libCacheSim/bin/MRC/CMakeLists.txt

@@ -15,5 +15,5 @@ set(mrc_sources_c
 )
 
 add_executable(MRC ${mrc_sources_c})
-target_link_libraries(MRC ${all_modules} ${dependency_libs})
+target_link_libraries(MRC ${core_libs} ${dependency_libs})
 install(TARGETS MRC RUNTIME DESTINATION bin)

libCacheSim/bin/MRC/SHARDS.c

@@ -108,7 +108,7 @@ void generate_shards_mrc(struct PARAM *params, char *path) {
   params->reader->init_params.sampler->sampling_ratio = 1.0;
   params->reader->sampler->sampling_ratio = 1.0;
   uint64_t n_req = get_num_of_req(params->reader);
-  printf("n_req: %lu\n", n_req);
+  printf("n_req: %llu\n", (unsigned long long)n_req);
   params->reader->init_params.sampler->sampling_ratio = params->rate;
   params->reader->sampler->sampling_ratio = params->rate;
 

libCacheSim/bin/MRC/main.c

@@ -51,8 +51,8 @@ int main(int argc, char **argv) {
           (double)return_value[i].n_miss / (double)return_value[i].n_req;
       double miss_ratio_byte = (double)return_value[i].n_miss_byte /
                                (double)return_value[i].n_req_byte;
-      fprintf(output_file, "%ld,%f, %f\n", cache_size, miss_ratio,
-              miss_ratio_byte);
+      fprintf(output_file, "%llu,%f, %f\n", (unsigned long long)cache_size,
+              miss_ratio, miss_ratio_byte);
     }
 
     fclose(output_file);
@@ -66,4 +66,4 @@ int main(int argc, char **argv) {
     fprintf(stderr, "Error: unknown algorithm type\n");
     return 1;
   }
-}
+}

libCacheSim/bin/MRC/mrc_internal.h

@@ -105,4 +105,4 @@ void parse_mini_cmd(int argc, char *argv[], struct MINI_arguments *args);
 
 #ifdef __cplusplus
 }
-#endif
+#endif

libCacheSim/bin/cachesim/CMakeLists.txt

@@ -10,6 +10,7 @@ set(cachesim_sources_c
 )
 add_executable(cachesim ${cachesim_sources_c})
 target_include_directories(cachesim PRIVATE ../)
-target_link_libraries(cachesim ${all_modules} ${dependency_libs})
-target_link_options(cachesim PRIVATE "-Wl,--export-dynamic")
+# Link just profiler_lib which now provides all needed libraries transitively
+target_link_libraries(cachesim profiler_lib)
+# target_link_options(cachesim PRIVATE "-Wl,--export-dynamic")  # Not supported on macOS
 install(TARGETS cachesim RUNTIME DESTINATION bin)

libCacheSim/bin/cachesim/sim.c

@@ -81,7 +81,7 @@ void simulate(reader_t *reader, cache_t *cache, int report_interval,
 
   if (!ignore_obj_size) convert_size_to_str(cache->cache_size, size_str);
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-truncation"
+  // Removed unknown pragma warning
   if (!ignore_obj_size) {
     snprintf(output_str, 1024,
              "%s %s cache size %8s, %16lu req, miss ratio %.4lf, throughput "
@@ -91,10 +91,11 @@ void simulate(reader_t *reader, cache_t *cache, int report_interval,
              (double)req_cnt / 1000000.0 / runtime);
   } else {
     snprintf(output_str, 1024,
-             "%s %s cache size %8ld, %16lu req, miss ratio %.4lf, throughput "
+             "%s %s cache size %8lld, %16lu req, miss ratio %.4lf, throughput "
              "%.2lf MQPS\n",
-             reader->trace_path, detailed_cache_name, cache->cache_size,
-             (unsigned long)req_cnt, (double)miss_cnt / (double)req_cnt,
+             reader->trace_path, detailed_cache_name,
+             (long long)cache->cache_size, (unsigned long)req_cnt,
+             (double)miss_cnt / (double)req_cnt,
              (double)req_cnt / 1000000.0 / runtime);
   }
 

libCacheSim/bin/customized/SOSP23/CMakeLists.txt

@@ -19,4 +19,4 @@ set(flash_sources_cpp
 )
 add_executable(flash ${flash_sources_cpp})
 target_include_directories(flash PRIVATE ../../)
-target_link_libraries(flash ${all_modules} utils_lib ${dependency_libs})
+target_link_libraries(flash ${core_libs} ${dependency_libs})

libCacheSim/bin/customized/SOSP23/oneHit/cli_parser.c

@@ -162,4 +162,4 @@ void free_arg(struct arguments *args) { close_reader(args->reader); }
 
 #ifdef __cplusplus
 }
-#endif
+#endif

libCacheSim/bin/customized/fast23/fast23.h

@@ -53,4 +53,4 @@ void cal_group_metric_over_time(std::string trace_path, std::string ofilepath,
                                 int group_size);
 void cal_group_metric_utility_over_time(std::string trace_path,
                                         std::string ofilepath, int group_size);
-}  // namespace compareGroups
+}  // namespace compareGroups