Improve instrumentation with lock information. Also add plots target to benchs/Makefile.