Skip to content

Fix benchmarking utils on RISC-V #2130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2023
Merged

Fix benchmarking utils on RISC-V #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b57dbfe
Fix benchmarking utils on RISC-V
rascani Jul 15, 2023
b5378e3
Add return value check for fread
rascani Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions tensorflow/lite/micro/tools/benchmarking/generic_model_benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/

#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.h>

Expand Down Expand Up @@ -76,37 +77,20 @@ void SetRandomInput(const uint32_t random_seed,
}

bool ReadFile(const char* file_name, void* buffer, size_t buffer_size) {
// Obtain the file size using fstat, or report an error if that fails.
std::unique_ptr<FILE, decltype(&fclose)> file(fopen(file_name, "rb"), fclose);
struct stat sb;

// For CMSIS_NN, the compilation is failing with the following error
// 'fileno' was not declared in this scope
// TODO(b/290988791): Investigate why fileno is not defined in arm toolchain.
#if defined(CMSIS_NN)
if (fstat(file.get()->_file, &sb) != 0) {
#else
if (fstat(fileno(file.get()), &sb) != 0) {
#endif
MicroPrintf("Failed to get file size of: %s\n", file_name);
return false;
}

if (!buffer) {
MicroPrintf("Malloc of buffer to hold copy of '%s' failed\n", file_name);
const size_t bytes_read =
fread(buffer, sizeof(char), buffer_size, file.get());
if (ferror(file.get())) {
MicroPrintf("Unable to read model file: %d\n", ferror(file.get()));
return false;
}

if (S_ISREG(sb.st_mode) != 0 &&
(sb.st_size < 0 || (static_cast<size_t>(sb.st_size) > buffer_size))) {
MicroPrintf(
"Buffer size (%ld) to hold the model is less than required %ld.\n",
buffer_size, sb.st_size);
if (!feof(file.get())) {
MicroPrintf("Model buffer is too small for the model.\n");
return false;
}

if (!fread(buffer, sizeof(char), sb.st_size, file.get())) {
MicroPrintf("Unable to read the model file or the model file is empty.\n");
if (bytes_read == 0) {
MicroPrintf("No bytes read from model file.\n");
return false;
}

Expand Down Expand Up @@ -173,4 +157,4 @@ int Benchmark(const char* model_file_name) {
} // namespace
} // namespace tflite

int main(int argc, char** argv) { return tflite::Benchmark(argv[1]); }
int main(int argc, char** argv) { return tflite::Benchmark(argv[1]); }
7 changes: 2 additions & 5 deletions tensorflow/lite/micro/tools/benchmarking/log_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License.

#include "tensorflow/lite/micro/tools/benchmarking/log_utils.h"

#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>

Expand Down Expand Up @@ -90,11 +91,7 @@ void PrettyPrintTableHeader(PrettyPrintType type, const char* table_name) {

template <>
void FormatNumber<int32_t>(char* output, int32_t value) {
#if defined(HEXAGON) || defined(CMSIS_NN)
sprintf(output, "%ld", value); // NOLINT: sprintf required.
#else
sprintf(output, "%d", value); // NOLINT: sprintf required.
#endif
sprintf(output, "%" PRId32, value); // NOLINT: sprintf required.
}

template <>
Expand Down