drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update benchmark with rgbcx.

Browse Source
This commit is contained in:
Ignacio 2020-04-04 10:21:00 -07:00
parent 0b15c58692
commit 52e065d66a
2 changed files with 2518 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2401
extern/rg/rgbcx.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

199
src/nvtt/tests/bc1enc.cpp
View File

@ -10,6 +10,9 @@
#define STB_DXT_IMPLEMENTATION #define STB_DXT_IMPLEMENTATION
#include "stb_dxt.h" #include "stb_dxt.h"
#define RGBCX_IMPLEMENTATION
#include "../extern/rg/rgbcx.h"
#include "../extern/libsquish-1.15/squish.h" #include "../extern/libsquish-1.15/squish.h"
#include "../extern/CMP_Core/source/CMP_Core.h" #include "../extern/CMP_Core/source/CMP_Core.h"
@ -31,15 +34,16 @@ typedef unsigned int u32;
#define TEST_STB 1 #define TEST_STB 1
#define TEST_STB_HQ 1 #define TEST_STB_HQ 1
#define TEST_RGBCX 1
#define TEST_NVTT_FAST 1 #define TEST_NVTT_FAST 1
#define TEST_NVTT_GELD 0
#define TEST_NVTT 1 #define TEST_NVTT 1
#define TEST_NVTT_HQ 1 #define TEST_NVTT_HQ 1
#define TEST_SQUISH 0 #define TEST_SQUISH 1
#define TEST_SQUISH_HQ 0 #define TEST_SQUISH_HQ 1
#define TEST_AMD_CMP 0 #define TEST_AMD_CMP 1
@ -151,7 +155,7 @@ bool output_dxt_dds (u32 w, u32 h, const u8* data, const char * filename) {
dds.width = w; dds.width = w;
dds.height = h; dds.height = h;
dds.pitch = 8 * ((w+3)/4 * (h+3)/4); // linear size dds.pitch = 8 * (((w+3)/4) * ((h+3)/4)); // linear size
FILE * fp = fopen(filename, "wb"); FILE * fp = fopen(filename, "wb");
if (fp == nullptr) return false; if (fp == nullptr) return false;
@ -242,13 +246,16 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("stb_dxt \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
//output_dxt_dds(bw, bh, block_data, "stb_dxt.dds"); if (stats) {
stats->compressorName = "stb"; stats->compressorName = "stb";
stats->mseArray[index] = mse; stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed(); stats->timeArray[index] = timer.elapsed();
stats++; stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "stb_dxt.dds");
}
} }
if (TEST_STB_HQ) { if (TEST_STB_HQ) {
@ -263,13 +270,42 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("stb_dxt hq \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
if (stats) {
stats->compressorName = "stb-hq";
stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed();
stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "stb_dxt_hq.dds");
}
}
//output_dxt_dds(bw, bh, block_data, "stb_dxt_hq.dds"); if (TEST_RGBCX) {
stats->compressorName = "stb-hq"; memset(block_data, 0, block_count * 8);
stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed(); rgbcx::encode_bc1_init();
stats++;
timer.start();
for (int i = 0; i < repeat_count; i++) {
for (int b = 0; b < block_count; b++) {
rgbcx::encode_bc1((block_data + b * 8), rgba_block_data + b * 4 * 4 * 4, rgbcx::LEVEL2_OPTIONS, rgbcx::DEFAULT_TOTAL_ORDERINGS_TO_TRY);
}
}
timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
if (stats) {
stats->compressorName = "rgbcx";
stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed();
stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "rgbcx.dds");
}
} }
if (TEST_NVTT_FAST) { if (TEST_NVTT_FAST) {
@ -295,35 +331,16 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("nvtt fast \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
if (stats) {
//output_dxt_dds(bw, bh, block_data, "nvtt_fast.dds"); stats->compressorName = "nvtt-fast";
stats->compressorName = "nvtt-fast"; stats->mseArray[index] = mse;
stats->mseArray[index] = mse; stats->timeArray[index] = timer.elapsed();
stats->timeArray[index] = timer.elapsed(); stats++;
stats++; }
} else {
output_dxt_dds(bw, bh, block_data, "nvtt_fast.dds");
if (TEST_NVTT_GELD) {
memset(block_data, 0, block_count * 8);
timer.start();
for (int i = 0; i < repeat_count; i++) {
for (int b = 0; b < block_count; b++) {
//compress_dxt1_fast2(rgba_block_data + b * 4 * 4 * 4, (BlockDXT1*)(block_data + b * 8));
compress_dxt1_fast_geld(rgba_block_data + b * 4 * 4 * 4, (BlockDXT1*)(block_data + b * 8));
}
} }
timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("nvtt fast2 \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
//output_dxt_dds(bw, bh, block_data, "nvtt_fast2.dds");
stats->compressorName = "nvtt-geld";
stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed();
stats++;
} }
if (TEST_NVTT) { if (TEST_NVTT) {
@ -349,13 +366,16 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("nvtt hq \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
//output_dxt_dds(bw, bh, block_data, "nvtt_hq.dds"); if (stats) {
stats->compressorName = "nvtt"; stats->compressorName = "nvtt";
stats->mseArray[index] = mse; stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed(); stats->timeArray[index] = timer.elapsed();
stats++; stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "nvtt.dds");
}
} }
if (TEST_NVTT_HQ) { if (TEST_NVTT_HQ) {
@ -381,13 +401,16 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("nvtt hq \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
//output_dxt_dds(bw, bh, block_data, "nvtt_hq.dds"); if (stats) {
stats->compressorName = "nvtt-hq"; stats->compressorName = "nvtt-hq";
stats->mseArray[index] = mse; stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed(); stats->timeArray[index] = timer.elapsed();
stats++; stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "nvtt_hq.dds");
}
} }
if (TEST_SQUISH) { if (TEST_SQUISH) {
@ -402,13 +425,16 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("squish \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
//output_dxt_dds(bw, bh, block_data, "squish.dds"); if (stats) {
stats->compressorName = "squish"; stats->compressorName = "squish";
stats->mseArray[index] = mse; stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed(); stats->timeArray[index] = timer.elapsed();
stats++; stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "squish.dds");
}
} }
if (TEST_SQUISH_HQ) { if (TEST_SQUISH_HQ) {
@ -423,13 +449,16 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("squish hq\t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
//output_dxt_dds(bw, bh, block_data, "squish_hq.dds"); if (stats) {
stats->compressorName = "squish-hq"; stats->compressorName = "squish-hq";
stats->mseArray[index] = mse; stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed(); stats->timeArray[index] = timer.elapsed();
stats++; stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "squish_hq.dds");
}
} }
if (TEST_AMD_CMP) { if (TEST_AMD_CMP) {
@ -444,13 +473,16 @@ bool test_bc1(const char * inputFileName, int index, Stats * stats) {
timer.stop(); timer.stop();
float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count); float mse = evaluate_dxt1_mse(rgba_block_data, block_data, block_count);
//printf("squish \t%f\t-> %f %f\n", timer.elapsed(), sqrt(mse), mse_to_psnr(mse));
//output_dxt_dds(bw, bh, block_data, "squish.dds"); if (stats) {
stats->compressorName = "cmp"; stats->compressorName = "cmp";
stats->mseArray[index] = mse; stats->mseArray[index] = mse;
stats->timeArray[index] = timer.elapsed(); stats->timeArray[index] = timer.elapsed();
stats++; stats++;
}
else {
output_dxt_dds(bw, bh, block_data, "squish.dds");
}
} }
return false; return false;
@ -621,6 +653,7 @@ const char * image_set[] = {
"testsuite/waterloo/sail.png", "testsuite/waterloo/sail.png",
"testsuite/waterloo/serrano.png", "testsuite/waterloo/serrano.png",
"testsuite/waterloo/tulips.png", "testsuite/waterloo/tulips.png",
//"testsuite/artificial.png",
}; };
const char * roblox_set[] = { const char * roblox_set[] = {
@ -667,19 +700,21 @@ const char * roblox_set[] = {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const char * inputFileName = "testsuite/kodak/kodim14.png"; const char * inputFileName = "testsuite/artificial.png";
//const char * inputFileName = "testsuite/kodak/kodim14.png";
//const char * inputFileName = "testsuite/kodak/kodim18.png"; //const char * inputFileName = "testsuite/kodak/kodim18.png";
//const char * inputFileName = "testsuite/kodak/kodim15.png"; //const char * inputFileName = "testsuite/kodak/kodim15.png";
//const char * inputFileName = "testsuite/waterloo/frymire.png"; //const char * inputFileName = "testsuite/waterloo/frymire.png";
//const char * inputFileName = "Roblox/leafygrass_top/diffuse.tga";
//test_bc1(inputFileName, 0); test_bc1(inputFileName, 0, NULL);
analyze_bc1(inputFileName); //analyze_bc1(inputFileName);
//const char ** set = roblox_set; const char ** set = roblox_set;
//int count = sizeof(roblox_set) / sizeof(char*); int count = sizeof(roblox_set) / sizeof(char*);
const char ** set = image_set; //const char ** set = image_set;
int count = sizeof(image_set) / sizeof(char*); //int count = sizeof(image_set) / sizeof(char*);
const int MAX_COMPRESSOR_COUNT = 16; const int MAX_COMPRESSOR_COUNT = 16;
Stats stats[MAX_COMPRESSOR_COUNT]; Stats stats[MAX_COMPRESSOR_COUNT];